diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:13:07 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:13:07 +0400 |
| commit | 10004d4a421b03f0cdf666b72b4cbadc216030e1 (patch) | |
| tree | 7b38dc0abb454f96dc39c7095532b4a574292459 /source/blender/collada/EffectExporter.cpp | |
| parent | 3ebbfe2c406955ed765a697825cde0c891e83a24 (diff) | |
fixed: [#32240] Collada import when nodes share geometry but not material
Diffstat (limited to 'source/blender/collada/EffectExporter.cpp')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 1eee797b51c..2d9ccc3e3ef 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -35,17 +35,19 @@ #include "DocumentExporter.h" #include "MaterialExporter.h" -#include "DNA_mesh_types.h" -#include "DNA_texture_types.h" -#include "DNA_world_types.h" - -#include "BKE_customdata.h" -#include "BKE_mesh.h" -#include "BKE_material.h" - #include "collada_internal.h" #include "collada_utils.h" +extern "C" { + #include "DNA_mesh_types.h" + #include "DNA_texture_types.h" + #include "DNA_world_types.h" + + #include "BKE_customdata.h" + #include "BKE_mesh.h" + #include "BKE_material.h" +} + // OB_MESH is assumed static std::string getActiveUVLayerName(Object *ob) { |