You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

santorac 9f7815fa04 Fixed up a couple incorrectly or incompletely resolved merge conflicts. ... Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>		4 years ago
..
MaterialDocument.cpp	Fixed up a couple incorrectly or incompletely resolved merge conflicts.	4 years ago
MaterialDocument.h	Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders.	4 years ago
MaterialDocumentModule.cpp	Moved material editor document system buses and system components to atom tools framework	4 years ago
MaterialDocumentSettings.cpp	Moved material editor document system buses and system components to atom tools framework	4 years ago
MaterialDocumentSystemComponent.cpp	Moved material editor document system buses and system components to atom tools framework	4 years ago
MaterialDocumentSystemComponent.h	Moved material editor document system buses and system components to atom tools framework	4 years ago