Browse Source

Disable "smart" import for shader files

BearishSun 8 years ago
parent
commit
0113eced29

+ 2 - 2
Source/BansheeEditor/Source/BsBuiltinEditorResources.cpp

@@ -434,9 +434,9 @@ namespace bs
 		BuiltinResourcesHelper::importAssets(iconsJSON, EditorRawIconsFolder, EditorIconFolder, mResourceManifest, 
 			BuiltinResourcesHelper::AssetType::Sprite, forceImport);
 		BuiltinResourcesHelper::importAssets(includesJSON, EditorRawShaderIncludeFolder, EditorShaderIncludeFolder, 
-			mResourceManifest, BuiltinResourcesHelper::AssetType::Normal, forceImport); // Hidden dependency: Includes must be imported before shaders
+			mResourceManifest, BuiltinResourcesHelper::AssetType::Normal, true); // Hidden dependency: Includes must be imported before shaders
 		BuiltinResourcesHelper::importAssets(shadersJSON, EditorRawShaderFolder, EditorShaderFolder, mResourceManifest,
-			BuiltinResourcesHelper::AssetType::Normal, forceImport);
+			BuiltinResourcesHelper::AssetType::Normal, true);
 		BuiltinResourcesHelper::importAssets(skinJSON, EditorRawSkinFolder, EditorSkinFolder, mResourceManifest, 
 			BuiltinResourcesHelper::AssetType::Sprite, forceImport);
 

+ 6 - 1
Source/BansheeEngine/Include/BsBuiltinResources.h

@@ -29,7 +29,12 @@ namespace bs
 	/** Types of builtin shaders that are always available. */
 	enum class BuiltinShader
 	{
-		Custom, Standard, Transparent
+		Custom, 
+		/** Physically based shader used for opaque 3D geometry. */
+		Standard, 
+
+		/** Physically based shader used for transparent 3D geometry. */
+		Transparent
 	};
 
 	/**	Holds references to built-in resources used by the core engine. */

+ 2 - 2
Source/BansheeEngine/Source/BsBuiltinResources.cpp

@@ -416,9 +416,9 @@ namespace bs
 		BuiltinResourcesHelper::importAssets(iconsJSON, rawIconFolder, iconFolder, mResourceManifest, 
 			BuiltinResourcesHelper::AssetType::Normal, forceImport);
 		BuiltinResourcesHelper::importAssets(includesJSON, rawShaderIncludeFolder, shaderIncludeFolder, mResourceManifest,
-			BuiltinResourcesHelper::AssetType::Normal, forceImport); // Hidden dependency: Includes must be imported before shaders
+			BuiltinResourcesHelper::AssetType::Normal, true); // Hidden dependency: Includes must be imported before shaders
 		BuiltinResourcesHelper::importAssets(shadersJSON, rawShaderFolder, mEngineShaderFolder, mResourceManifest,
-			BuiltinResourcesHelper::AssetType::Normal, forceImport);
+			BuiltinResourcesHelper::AssetType::Normal, true);
 		BuiltinResourcesHelper::importAssets(skinJSON, rawSkinFolder, skinFolder, mResourceManifest, 
 			BuiltinResourcesHelper::AssetType::Sprite);