Merge branch 'master' into macos

Author: malytomas

sources/asset-processor/model.cpp

@@ -293,6 +293,7 @@ void processModel()
 
 	for (const auto &t : part.textures)
 	{
+		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "looking at texture: " + t.name + ", type: " + meshImportTextureTypeToString(t.type));
 		const String p = processor->convertAssetPath(t.name);
 		const uint32 n = HashString(p);
 		switch (t.type)
@@ -315,7 +316,10 @@ void processModel()
 	}
 
 	if (!part.shaderName.empty())
+	{
+		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "looking at shader: " + part.shaderName);
 		dsm.shaderName = HashString(processor->convertAssetPath(part.shaderName));
+	}
 
 	dsm.renderFlags = part.renderFlags;
 	dsm.renderLayer = part.renderLayer;

sources/libcore/assets/assetProcessor.cpp

@@ -72,7 +72,7 @@ namespace cage
 				if (isPattern(input, inputDirectory, "", ""))
 					input = subString(input, inputDirectory.length(), m);
 				if (input.empty())
-					CAGE_THROW_ERROR(Exception, "input cannot be empty");
+					CAGE_THROW_ERROR(Exception, "input path cannot be empty");
 				if (pathIsAbs(input))
 				{
 					if (input[0] != '/')
@@ -86,7 +86,7 @@ namespace cage
 					input = pathJoin(relativeTo, input);
 				}
 				if (input.empty())
-					CAGE_THROW_ERROR(Exception, "input cannot be empty");
+					CAGE_THROW_ERROR(Exception, "input path cannot be empty");
 				return input;
 			}