Commit: 0d41f63eb212d37be1a58a8f6a98d94baddbed0c Author: Daniel Genrich Date: Thu Oct 23 18:04:28 2014 +0200 Branches: soc-2014-fluid https://developer.blender.org/rB0d41f63eb212d37be1a58a8f6a98d94baddbed0c
Revert changes. Still one linking error left. =================================================================== M source/blender/python/manta_pp/pwrapper/manta_api.cpp =================================================================== diff --git a/source/blender/python/manta_pp/pwrapper/manta_api.cpp b/source/blender/python/manta_pp/pwrapper/manta_api.cpp index 61ae3c0..4184a32 100644 --- a/source/blender/python/manta_pp/pwrapper/manta_api.cpp +++ b/source/blender/python/manta_pp/pwrapper/manta_api.cpp @@ -14,7 +14,14 @@ typedef char pyChar; typedef string pyString; #endif +//#ifdef __cplusplus +extern "C" { +//#endif PyObject * PyInit_Manta(void) { return Pb::PyInit_Main_Obj(); } + +//#ifdef __cplusplus +} +//#endif _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs