Main: ScriptTranslator - do not assert on empty material names

OGRECave · May 19, 2024 · 61e6003 · 61e6003
1 parent ca67f2a
commit 61e6003
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/OgreMain/src/OgreBuiltinScriptTranslators.h b/OgreMain/src/OgreBuiltinScriptTranslators.h
@@ -38,7 +38,6 @@ namespace Ogre{
  class MaterialTranslator : public ScriptTranslator
  {
  protected:
- Material *mMaterial;
  Ogre::AliasTextureNamePairList mTextureAliases;
  public:
  MaterialTranslator();

diff --git a/OgreMain/src/OgreScriptTranslator.cpp b/OgreMain/src/OgreScriptTranslator.cpp
@@ -1025,15 +1025,19 @@ namespace Ogre{
  * MaterialTranslator
  *************************************************************************/
  MaterialTranslator::MaterialTranslator()
- :mMaterial(0)
  {
  }
  //-------------------------------------------------------------------------
  void MaterialTranslator::translate(ScriptCompiler *compiler, const AbstractNodePtr &node)
  {
  ObjectAbstractNode *obj = static_cast<ObjectAbstractNode*>(node.get());
  if(obj->name.empty())
+ {
  compiler->addError(ScriptCompiler::CE_OBJECTNAMEEXPECTED, obj->file, obj->line);
+ return;
+ }
+
+ Material* mMaterial = 0;
 
  // Create a material with the given name
  CreateMaterialScriptCompilerEvent evt(node->file, obj->name, compiler->getResourceGroup());