Don't call newMaterial() every time we load a (sub)material.

--HG-- branch : gsoc2013-dfighter
11 years ago · 390d1bb156
parent dbd5185de1
commit 390d1bb156
1 changed files with 8 additions and 2 deletions
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/nel3d_interface.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/nel3d_interface.cpp
@ -258,9 +258,15 @@ namespace MaterialEditor
 		if( !xml.init( file ) )
 			return false;

-		newMaterial();
 		NL3D::CDynMaterial *mat = currentShape.getMaterial( subMatId ).getObjectPtr()->getDynMat();
-		mat->clear();
+		if( mat != NULL )
+			mat->clear();
+		else
+		{
+			currentShape.getMaterial( subMatId ).getObjectPtr()->createCleanDynMat();
+			mat = currentShape.getMaterial( subMatId ).getObjectPtr()->getDynMat();
+		}
+
 		mat->serial( xml );
 		file.close();