Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-05 20:03:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-05 20:03:57 +0400
commit1dccd4c98a4909383b9c11f7c2ee987e22833dad (patch)
tree3d127436243536d6ceaba4cb884249156ba215cd /source/blender/collada/DocumentImporter.cpp
parentff4ff9c8a429d9869e7056417bc7acd47a545eb2 (diff)
code cleanup: naming - pose/armature/image
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
-rw-r--r--source/blender/collada/DocumentImporter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 98a30fbef74..6dca7828cc2 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -572,7 +572,7 @@ bool DocumentImporter::writeMaterial( const COLLADAFW::Material* cmat )
return true;
const std::string& str_mat_id = cmat->getName().size() ? cmat->getName() : cmat->getOriginalId();
- Material *ma = add_material((char*)str_mat_id.c_str());
+ Material *ma = BKE_material_add((char*)str_mat_id.c_str());
this->uid_effect_map[cmat->getInstantiatedEffect()] = ma;
this->uid_material_map[cmat->getUniqueId()] = ma;
@@ -949,8 +949,8 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
la_id = light->getOriginalId();
la_name = light->getName();
- if (la_name.size()) lamp = (Lamp*)add_lamp((char*)la_name.c_str());
- else lamp = (Lamp*)add_lamp((char*)la_id.c_str());
+ 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 (!lamp) {
fprintf(stderr, "Cannot create lamp.\n");