archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: naming - pose/armature/image

Browse Source 
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
This commit is contained in:
Campbell Barton
2012-05-05 16:03:57 +00:00
parent ff4ff9c8a4
commit 1dccd4c98a
121 changed files with 566 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/collada/DocumentImporter.cpp
View File

@@ -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");