birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6b96be82ea'
${ noResults }
o3de/Code/Tools/SceneAPI/SceneCore
History
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
 		4 years ago
..
Components Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Containers Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DataTypes addressing PR comments/suggestions 4 years ago
Events Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112) 4 years ago
Export Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Import Fix python fbx tests (#2171) 4 years ago
Mocks Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Tests Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Utilities Move BuildDebugSceneGraph function out of SceneProcessing gem (#3290) 4 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DllMain.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SceneBuilderDependencyBus.h Added a new registry setting that disables automatic conversion of materials from model files like FBX. 4 years ago
SceneCoreConfiguration.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SceneCoreStandaloneAllocator.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SceneCoreStandaloneAllocator.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scenecore_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
scenecore_testing_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago