[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54320] trunk/blender/source/blender/ collada: Woops, forgot this in previous commit

Sergey Sharybin sergey.vfx at gmail.com
Tue Feb 5 14:05:51 CET 2013


Revision: 54320
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54320
Author:   nazgul
Date:     2013-02-05 13:05:51 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Woops, forgot this in previous commit

Modified Paths:
--------------
    trunk/blender/source/blender/collada/MeshImporter.cpp
    trunk/blender/source/blender/collada/collada_utils.cpp

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp	2013-02-05 13:04:01 UTC (rev 54319)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp	2013-02-05 13:05:51 UTC (rev 54320)
@@ -1296,7 +1296,7 @@
 	}
 	
 	const std::string& str_geom_id = mesh->getName().size() ? mesh->getName() : mesh->getOriginalId();
-	Mesh *me = BKE_mesh_add((char *)str_geom_id.c_str());
+	Mesh *me = BKE_mesh_add(G.main, (char *)str_geom_id.c_str());
 	me->id.us--; // is already 1 here, but will be set later in set_mesh
 
 	// store the Mesh pointer to link it later with an Object

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2013-02-05 13:04:01 UTC (rev 54319)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2013-02-05 13:05:51 UTC (rev 54320)
@@ -151,7 +151,7 @@
 		}
 	}
 
-	tmpmesh = BKE_mesh_add("ColladaMesh"); // name is not important here
+	tmpmesh = BKE_mesh_add(G.main, "ColladaMesh"); // name is not important here
 	DM_to_mesh(dm, tmpmesh, ob);
 	dm->release(dm);
 	return tmpmesh;




More information about the Bf-blender-cvs mailing list