quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: don't increment target/names on file.import

Browse Source
This commit is contained in:
Garux 2021-12-08 13:40:28 +03:00
parent bf3f194cff
commit 58b440b6aa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radiant/map.cpp
View File

@ -699,7 +699,7 @@ public:
void Map_ImportSelected( TextInputStream& in, const MapFormat& format ){ void Map_ImportSelected( TextInputStream& in, const MapFormat& format ){
NodeSmartReference node( ( new BasicContainer )->node() ); NodeSmartReference node( ( new BasicContainer )->node() );
EBrushType brush_type = GlobalBrushCreator().getFormat(); const EBrushType brush_type = GlobalBrushCreator().getFormat();
format.readGraph( node, in, GlobalEntityCreator() ); format.readGraph( node, in, GlobalEntityCreator() );
if ( brush_type != GlobalBrushCreator().getFormat() ) { if ( brush_type != GlobalBrushCreator().getFormat() ) {
Node_getTraversable( node )->traverse( Convert_Brushes( BrushType_getTexdefType( GlobalBrushCreator().getFormat() ), BrushType_getTexdefType( brush_type ) ) ); Node_getTraversable( node )->traverse( Convert_Brushes( BrushType_getTexdefType( GlobalBrushCreator().getFormat() ), BrushType_getTexdefType( brush_type ) ) );
@ -1665,7 +1665,7 @@ bool Map_ImportFile( const char* filename ){
} }
{ {
EBrushType brush_type = GlobalBrushCreator().getFormat(); const EBrushType brush_type = GlobalBrushCreator().getFormat();
Resource* resource = GlobalReferenceCache().capture( filename ); Resource* resource = GlobalReferenceCache().capture( filename );
resource->refresh(); // avoid loading old version if map has changed on disk since last import resource->refresh(); // avoid loading old version if map has changed on disk since last import
@ -1682,11 +1682,12 @@ bool Map_ImportFile( const char* filename ){
} }
NodeSmartReference clone( NewMapRoot( "" ) ); NodeSmartReference clone( NewMapRoot( "" ) );
Node_getTraversable( *resource->getNode() )->traverse( CloneAll( clone ) ); Node_getTraversable( *resource->getNode() )->traverse( CloneAll( clone ) );
resource->flush(); /* wipe map from cache to not spoil namespace */
GlobalReferenceCache().release( filename );
Map_gatherNamespaced( clone ); Map_gatherNamespaced( clone );
Map_mergeClonedNames(); Map_mergeClonedNames();
MergeMap( clone ); MergeMap( clone );
success = true; success = true;
GlobalReferenceCache().release( filename );
} }
SceneChangeNotify(); SceneChangeNotify();
@ -1716,7 +1717,7 @@ tryDecompile:
str( PathExtensionless( filename ), "_converted.map" ); str( PathExtensionless( filename ), "_converted.map" );
filename = str.c_str(); filename = str.c_str();
EBrushType brush_type = GlobalBrushCreator().getFormat(); const EBrushType brush_type = GlobalBrushCreator().getFormat();
// open // open
Resource* resource = GlobalReferenceCache().capture( filename ); Resource* resource = GlobalReferenceCache().capture( filename );
resource->refresh(); // avoid loading old version if map has changed on disk since last import resource->refresh(); // avoid loading old version if map has changed on disk since last import
@ -1733,11 +1734,12 @@ tryDecompile:
} }
NodeSmartReference clone( NewMapRoot( "" ) ); NodeSmartReference clone( NewMapRoot( "" ) );
Node_getTraversable( *resource->getNode() )->traverse( CloneAll( clone ) ); Node_getTraversable( *resource->getNode() )->traverse( CloneAll( clone ) );
resource->flush(); /* wipe map from cache to not spoil namespace */
GlobalReferenceCache().release( filename );
Map_gatherNamespaced( clone ); Map_gatherNamespaced( clone );
Map_mergeClonedNames(); Map_mergeClonedNames();
MergeMap( clone ); MergeMap( clone );
success = true; success = true;
GlobalReferenceCache().release( filename );
} }
SceneChangeNotify(); SceneChangeNotify();