Merge pull request #63 from ConfettiFX/confetti-dev

Bug Fixing
ConfettiFX · Jul 14, 2018 · d3d89b5 · d3d89b5
2 parents 91317c5 + ba87843
commit d3d89b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln b/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln
@@ -99,6 +99,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06_MaterialPlayground", "06_MaterialPlayground.vcxproj", "{611831C0-6301-4DB2-A61E-2596129C9239}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DFAAEF2D-9A5E-475E-86BA-59529DD39CF3} = {DFAAEF2D-9A5E-475E-86BA-59529DD39CF3}
+		{C5D0E437-7C52-3132-80E6-3CBE834313EF} = {C5D0E437-7C52-3132-80E6-3CBE834313EF}
+		{1018594F-0769-4244-BED4-CEB06EBBAE22} = {1018594F-0769-4244-BED4-CEB06EBBAE22}
 		{EBC1C8D7-D49B-409A-A575-5AB53111E4D7} = {EBC1C8D7-D49B-409A-A575-5AB53111E4D7}
 	EndProjectSection
 EndProject
@@ -122,9 +124,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "09_LightShadowPlayground",
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		DebugDx|x64 = DebugDx|x64
 		DebugDx|x86 = DebugDx|x86
@@ -375,4 +374,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {948F21A0-5B36-35C9-B219-88B1DAC0D0C2}
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal
diff --git a/Examples_3/Unit_Tests/src/06_MaterialPlayground/06_MaterialPlayground.cpp b/Examples_3/Unit_Tests/src/06_MaterialPlayground/06_MaterialPlayground.cpp
@@ -879,11 +879,10 @@ class MaterialPlayground : public IApp
 		initResourceLoaderInterface(pRenderer, DEFAULT_MEMORY_BUDGET, true);
 		initDebugRendererInterface(pRenderer, "TitilliumText/TitilliumText-Bold.ttf", FSR_Builtin_Fonts);
 
-		tinystl::vector<Image> toLoad;
+		tinystl::vector<Image> toLoad(gMaterialNames.size());
         //adding material textures
         for(int i = 0 ; i <gMaterialNames.size(); ++i)
         {
-			toLoad.push_back(Image());
             TextureLoadDesc textureDesc = {};
 #ifndef TARGET_IOS
             textureDesc.mRoot = FSR_Textures;