[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54319] trunk/blender/source/blender/ collada/DocumentImporter.cpp: Attempt to fix collada compilation after recent commit
Sergey Sharybin
sergey.vfx at gmail.com
Tue Feb 5 14:04:01 CET 2013
Revision: 54319
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54319
Author: nazgul
Date: 2013-02-05 13:04:01 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Attempt to fix collada compilation after recent commit
I don't have recent collada compiled here atm, so perhaps there're
more issues here.
Modified Paths:
--------------
trunk/blender/source/blender/collada/DocumentImporter.cpp
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-02-05 12:46:15 UTC (rev 54318)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-02-05 13:04:01 UTC (rev 54319)
@@ -601,7 +601,7 @@
return true;
const std::string& str_mat_id = cmat->getName().size() ? cmat->getName() : cmat->getOriginalId();
- Material *ma = BKE_material_add((char *)str_mat_id.c_str());
+ Material *ma = BKE_material_add(G.main, (char *)str_mat_id.c_str());
this->uid_effect_map[cmat->getInstantiatedEffect()] = ma;
this->uid_material_map[cmat->getUniqueId()] = ma;
@@ -625,7 +625,7 @@
ma->mtex[i] = add_mtex();
ma->mtex[i]->texco = TEXCO_UV;
- ma->mtex[i]->tex = add_texture("Texture");
+ ma->mtex[i]->tex = add_texture(G.main, "Texture");
ma->mtex[i]->tex->type = TEX_IMAGE;
ma->mtex[i]->tex->ima = uid_image_map[ima_uid];
@@ -831,8 +831,8 @@
cam_id = camera->getOriginalId();
cam_name = camera->getName();
- if (cam_name.size()) cam = (Camera *)BKE_camera_add((char *)cam_name.c_str());
- else cam = (Camera *)BKE_camera_add((char *)cam_id.c_str());
+ if (cam_name.size()) cam = (Camera *)BKE_camera_add(G.main, (char *)cam_name.c_str());
+ else cam = (Camera *)BKE_camera_add(G.main, (char *)cam_id.c_str());
if (!cam) {
fprintf(stderr, "Cannot create camera.\n");
@@ -981,8 +981,8 @@
la_id = light->getOriginalId();
la_name = light->getName();
- if (la_name.size()) lamp = (Lamp *)BKE_lamp_add((char *)la_name.c_str());
- else lamp = (Lamp *)BKE_lamp_add((char *)la_id.c_str());
+ if (la_name.size()) lamp = (Lamp *)BKE_lamp_add(G.main, (char *)la_name.c_str());
+ else lamp = (Lamp *)BKE_lamp_add(G.main, (char *)la_id.c_str());
if (!lamp) {
fprintf(stderr, "Cannot create lamp.\n");
More information about the Bf-blender-cvs
mailing list