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/MaterialExporter.h | |
| parent | 3ebbfe2c406955ed765a697825cde0c891e83a24 (diff) | |
fixed: [#32240] Collada import when nodes share geometry but not material
Diffstat (limited to 'source/blender/collada/MaterialExporter.h')
| -rw-r--r-- | source/blender/collada/MaterialExporter.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h index f65c8849c84..09d10846b53 100644 --- a/source/blender/collada/MaterialExporter.h +++ b/source/blender/collada/MaterialExporter.h @@ -34,11 +34,12 @@ #include "COLLADASWLibraryMaterials.h" #include "COLLADASWStreamWriter.h" -#include "BKE_material.h" - -#include "DNA_material_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" +extern "C" { + #include "BKE_material.h" + #include "DNA_material_types.h" + #include "DNA_object_types.h" + #include "DNA_scene_types.h" +} #include "GeometryExporter.h" #include "collada_internal.h" |