From: Thomas Debesse <dev@illwieckz.net>
Date: Sun, 28 Oct 2018 19:45:16 +0000 (+0100)
Subject: do not fail on missing image or model plugin, they can be optional
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F105%2Fhead;p=xonotic%2Fnetradiant.git

do not fail on missing image or model plugin, they can be optional
---

diff --git a/libs/modulesystem/modulesmap.h b/libs/modulesystem/modulesmap.h
index a48a083b..fae4c2a6 100644
--- a/libs/modulesystem/modulesmap.h
+++ b/libs/modulesystem/modulesmap.h
@@ -99,6 +99,7 @@ class ModulesRef
 ModulesMap<Type> m_modules;
 public:
 ModulesRef( const char* names ){
+	std::string type_name { typename Type::Name() };
 	if ( !globalModuleServer().getError() ) {
 		if ( string_equal( names, "*" ) ) {
 			InsertModules<Type> visitor( m_modules );
@@ -115,8 +116,14 @@ ModulesRef( const char* names ){
 				}
 				Module* module = globalModuleServer().findModule( typename Type::Name(), typename Type::Version(), name );
 				if ( module == 0 ) {
-					globalModuleServer().setError( true );
-					globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
+					// do not fail on missing image or model plugin, they can be optional
+					if ( type_name.compare("image") == 0 || type_name.compare("model") == 0 ) {
+						globalOutputStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
+					}
+					else {
+						globalModuleServer().setError( true );
+						globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
+					}
 					break;
 				}
 				else