Commit: f43088623cb79b9b79ed98cf5dfc6cf2285fd2cb Author: Daniel Genrich Date: Thu Oct 23 17:17:01 2014 +0200 Branches: soc-2014-fluid https://developer.blender.org/rBf43088623cb79b9b79ed98cf5dfc6cf2285fd2cb
Revert name changes to be conform with mana_full =================================================================== M source/blender/python/intern/bpy_interface.c M source/blender/python/manta_pp/pwrapper/manta_api.cpp M source/blender/python/manta_pp/pwrapper/manta_api.h =================================================================== diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 032bfd3..971616f 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -224,7 +224,7 @@ static struct _inittab bpy_internal_modules[] = { {"bgl", BPyInit_bgl}, {"blf", BPyInit_blf}, {"bmesh", BPyInit_bmesh}, - {"manta", BPyInit_manta}, + { "manta", PyInit_Manta}, #if 0 {"bmesh.types", BPyInit_bmesh_types}, {"bmesh.utils", BPyInit_bmesh_utils}, diff --git a/source/blender/python/manta_pp/pwrapper/manta_api.cpp b/source/blender/python/manta_pp/pwrapper/manta_api.cpp index feba7c5..61ae3c0 100644 --- a/source/blender/python/manta_pp/pwrapper/manta_api.cpp +++ b/source/blender/python/manta_pp/pwrapper/manta_api.cpp @@ -14,14 +14,7 @@ typedef char pyChar; typedef string pyString; #endif -//#ifdef __cplusplus -extern "C" { -//#endif -PyObject * BPyInit_manta(void) +PyObject * PyInit_Manta(void) { return Pb::PyInit_Main_Obj(); } - -//#ifdef __cplusplus -} -//#endif \ No newline at end of file diff --git a/source/blender/python/manta_pp/pwrapper/manta_api.h b/source/blender/python/manta_pp/pwrapper/manta_api.h index 260f7b5..3fbfe6f 100644 --- a/source/blender/python/manta_pp/pwrapper/manta_api.h +++ b/source/blender/python/manta_pp/pwrapper/manta_api.h @@ -1,6 +1,6 @@ #ifndef _MANTA_API_H_ #define _MANTA_API_H_ //#include "pythonInclude.h" -PyObject * BPyInit_manta(void); +PyObject * PyInit_Manta(void); PyMODINIT_FUNC PyInit_Main_Link(void); #endif _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs