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 2774ac1811 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures		4 years ago
..
Document	Fixed up a couple incorrectly or incompletely resolved merge conflicts.	4 years ago
Platform	removing ly_add_target_dependencies	4 years ago
Viewport	Moved asynchronous image loading function to atom tools framework	4 years ago
Window	Moved asynchronous image loading function to atom tools framework	4 years ago
MaterialEditorApplication.cpp	Moved material editor document system buses and system components to atom tools framework	4 years ago
MaterialEditorApplication.h	Moved material editor document system buses and system components to atom tools framework	4 years ago
main.cpp	AtomTools: moved more startup code from main cpp files into the base application class	4 years ago
resource.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago