Daniele Bartolini 10 лет назад
Родитель
Сommit
0508af9fe4
2 измененных файлов с 2 добавлено и 12 удалено
  1. 1 6
      src/resource/material_resource.cpp
  2. 1 6
      src/resource/package_resource.cpp

+ 1 - 6
src/resource/material_resource.cpp

@@ -86,12 +86,7 @@ namespace material_resource
 
 			DynamicString texture(ta);
 			sjson::parse_string(value, texture);
-			RESOURCE_COMPILER_ASSERT(opts.resource_exists(RESOURCE_EXTENSION_TEXTURE, texture.c_str())
-				, opts
-				, "Resource does not exist: '%s.%s'"
-				, texture.c_str()
-				, RESOURCE_EXTENSION_TEXTURE
-				);
+			RESOURCE_COMPILER_ASSERT_RESOURCE_EXISTS(RESOURCE_EXTENSION_TEXTURE, texture.c_str(), opts);
 
 			TextureHandle th;
 			th.sampler_handle = 0;

+ 1 - 6
src/resource/package_resource.cpp

@@ -28,12 +28,7 @@ namespace package_resource
 			DynamicString name(ta);
 			sjson::parse_string(names[i], name);
 
-			RESOURCE_COMPILER_ASSERT(opts.resource_exists(type, name.c_str())
-				, opts
-				, "Resource does not exist: '%s.%s'"
-				, name.c_str()
-				, type
-				);
+			RESOURCE_COMPILER_ASSERT_RESOURCE_EXISTS(type, name.c_str(), opts);
 
 			const StringId64 nameh = sjson::parse_resource_id(names[i]);
 			array::push_back(output, PackageResource::Resource(typeh, nameh));