Source/MasterTestProject/GLTF/StaticGLTFComponent.h · 24f6dcc342ebf17789c96d886be1b2c9807a752e · Kai Westerkamp / MasterTestProjekt

Merge remote-tracking branch 'remotes/origin/Assimp' · 24f6dcc3

authored May 26, 2017

# Conflicts:
#	Source/MasterTestProject/GLTF/StaticGLTFComponent.cpp
#	Source/MasterTestProject/GLTFDisplay.cpp
#	Source/MasterTestProject/MasterTestProject.Build.cs

24f6dcc3

StaticGLTFComponent.h 4.68 KB

Replace StaticGLTFComponent.h