[Bf-blender-cvs] [33e32c341a] master: collada: add extern 'C' for c header includes

Gaia Clary noreply at git.blender.org
Thu Mar 23 15:03:20 CET 2017


Commit: 33e32c341aa0139f8ac03006d9b14c7df6277d65
Author: Gaia Clary
Date:   Tue Mar 21 17:42:34 2017 +0100
Branches: master
https://developer.blender.org/rB33e32c341aa0139f8ac03006d9b14c7df6277d65

collada: add extern 'C' for c header includes

===================================================================

M	source/blender/collada/ArmatureImporter.cpp

===================================================================

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index a365b5ca35..6a8fe2e13f 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -32,6 +32,7 @@
 
 #include "COLLADAFWUniqueId.h"
 
+extern "C" {
 #include "BKE_action.h"
 #include "BKE_depsgraph.h"
 #include "BKE_object.h"
@@ -39,6 +40,7 @@
 #include "BLI_string.h"
 #include "BLI_listbase.h"
 #include "ED_armature.h"
+}
 
 #include "ArmatureImporter.h"




More information about the Bf-blender-cvs mailing list