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.

Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>		4 years ago
..
External/MaskedOcclusionCulling	Added Masked Occlusion Culling external files	5 years ago
Include/Atom	Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development	4 years ago
Source	Merge branch 'development' into cmake/linux_fix_warn_unused	4 years ago
Tests	Merge branch 'development' into cmake/linux_fix_warn_unused	4 years ago
Tests.Builders	merge development	4 years ago
Tests.Editor	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
CMakeLists.txt	Undo artifacts for JsonUtils sojourn into AzToolsFramework	4 years ago
atom_rpi_builders_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_builders_shared_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_builders_stub_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_builders_tests_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_edit_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_editor_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_editor_tests_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_masked_occlusion_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_private_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_private_shared_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_public_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
atom_rpi_reflect_files.cmake	Refactored how model material slots work in preparation to support more flexible material conversion options for the scene asset pipeline. The material slot IDs are based on the MaterialUid that come from SceneAPI. Since these IDs are also used as the AssetId sub-ID for the converted material assets, the system was just checking the material asset sub-ID to determine the material slot ID. But in order to support certain FBX material conversion options, we needed to break this tie, so the slot ID is separate from the AssetId of the material in that slot. This will allow some other material to be used in the slot, instead of being forced to use one that was generated from the FBX.	4 years ago
atom_rpi_tests_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
rpi_shared_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago