diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-12-28 01:22:43 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-12-28 01:22:43 +0300 |
| commit | 540ab7a55af91ae1eca00a90cc53f293d876f5a8 (patch) | |
| tree | 387111cbb6ecbc36fa759aadd5ad8192f76927e7 /source/blender/collada/DocumentImporter.cpp | |
| parent | c4c3d84d5805d8c91aa3ef06f70492d60f4e7778 (diff) | |
Changes to rename_id function:
* Don't copy name before entering new_id function. new_id does that for
us already.
* Take a main argument to make the function possible to use with
different databases
* Append BKE_ to rename_id
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 498e65790f3..45b8a4fe5d4 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -654,7 +654,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA for (std::vector<Object *>::iterator it = objects_done->begin(); it != objects_done->end(); ++it) { ob = *it; std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId(); - rename_id(&ob->id, (char *)nodename.c_str()); + BKE_rename_id(NULL, &ob->id, (char *)nodename.c_str()); object_map.insert(std::pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), ob)); node_map[node->getUniqueId()] = node; |