Pārlūkot izejas kodu

Merge pull request #1203 from Azaezel/alpha41/stringSpecification

resolve ambiguity
Brian Roberts 1 gadu atpakaļ
vecāks
revīzija
1d906503b6
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  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)