From 012e0a20665ffc08967378009bf6ed45af845948 Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Sat, 2 Jan 2016 14:04:28 +1100 Subject: [PATCH] Clean up naming of plugin VRML test output --- plugins/3d/idf/s3d_plugin_idf.cpp | 2 +- plugins/3d/vrml/vrml.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/3d/idf/s3d_plugin_idf.cpp b/plugins/3d/idf/s3d_plugin_idf.cpp index 157fbac95f..ff9861f417 100644 --- a/plugins/3d/idf/s3d_plugin_idf.cpp +++ b/plugins/3d/idf/s3d_plugin_idf.cpp @@ -299,7 +299,7 @@ SCENEGRAPH* Load( char const* aFileName ) if( data ) { wxFileName fn( aFileName ); - wxString output = wxT( "z" ); + wxString output = wxT( "_idf-" ); output.append( fn.GetName() ); output.append( wxT(".wrl") ); S3D::WriteVRML( output, true, (SGNODE*)(data), true, true ); diff --git a/plugins/3d/vrml/vrml.cpp b/plugins/3d/vrml/vrml.cpp index 477288a1ef..5c3932d17b 100644 --- a/plugins/3d/vrml/vrml.cpp +++ b/plugins/3d/vrml/vrml.cpp @@ -221,7 +221,13 @@ SCENEGRAPH* Load( char const* aFileName ) if( scene ) { wxFileName fn( wxString::FromUTF8Unchecked( aFileName ) ); - wxString output = wxT( "_" ); + wxString output; + + if( proc.GetVRMLType() == VRML_V1 ) + output = wxT( "_vrml1-" ); + else + output = wxT( "_vrml2-" ); + output.append( fn.GetName() ); output.append( wxT(".wrl") ); S3D::WriteVRML( output, true, (SGNODE*)(scene), true, true );