瀏覽代碼

resolve ambiguity
clang + ninja via clion disliked a string assignment from a case that could feed a string either another string or a char *, soi used the latter acroiss the board

AzaezelX 1 年之前
父節點
當前提交
67af2e0e0c
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      Engine/source/gui/worldEditor/worldEditor.cpp

+ 1 - 1
Engine/source/gui/worldEditor/worldEditor.cpp

@@ -488,7 +488,7 @@ bool WorldEditor::pasteSelection( bool dropSel )
          continue;
 
       StringTableEntry baseName = obj->getName();
-      String outName = (baseName != StringTable->EmptyString()) ? Sim::getUniqueName(baseName) : StringTable->EmptyString();
+      const char * outName = (baseName != StringTable->EmptyString()) ? Sim::getUniqueName(baseName).c_str() : StringTable->EmptyString();
       obj->assignName(outName);
 
       if (targetGroup)