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:
authorGaia Clary <gaia.clary@machinimatrix.org>2017-06-24 22:36:03 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2017-06-24 23:16:47 +0300
commit0d2b1da3a6f5b16fbcd514197211c9cfbf3c09f9 (patch)
treed662766ab741be50c24e0b030ceff99d5ca07b17 /source/blender/collada/collada_internal.cpp
parentce531ed1a12edcc51b717cbc12e38e8550e8f979 (diff)
Collada: added new functions for improved material exporter (not used yet)
Diffstat (limited to 'source/blender/collada/collada_internal.cpp')
-rw-r--r--source/blender/collada/collada_internal.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index 6ebde6bd773..8974acb3460 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -344,7 +344,13 @@ std::string get_camera_id(Object *ob)
std::string get_material_id(Material *mat)
{
- return translate_id(id_name(mat)) + "-material";
+ std::string id = id_name(mat);
+ return get_material_id_from_id(id);
+}
+
+std::string get_material_id_from_id(std::string id)
+{
+ return translate_id(id) + "-material";
}
std::string get_morph_id(Object *ob)