diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 17:24:52 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 17:24:52 +0300 |
| commit | 82b21ba1663b253b4bde318599eedd062b5e9f64 (patch) | |
| tree | bbe6dbf3c966834cd223054ad8e86b0099cefbac /source/blender/collada/collada_internal.h | |
| parent | 9234cb6e30ed36dfcfae794824fcbb88618e060f (diff) | |
Fix [#26213] Collada exporter id's not unique
Reported by Kevin Yoon
<material> could get same id as <node>, prevent that by suffixing -material.
Diffstat (limited to 'source/blender/collada/collada_internal.h')
| -rw-r--r-- | source/blender/collada/collada_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 815113400b4..db7dd16dfd1 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -37,6 +37,7 @@ #include "Math/COLLADABUMathMatrix4.h" #include "DNA_armature_types.h" +#include "DNA_material_types.h" #include "DNA_object_types.h" #include "BLI_math.h" @@ -94,4 +95,6 @@ extern std::string get_joint_id(Bone *bone, Object *ob_arm); extern std::string get_camera_id(Object *ob); +extern std::string get_material_id(Material *mat); + #endif /* COLLADA_INTERNAL_H */ |