[Bf-blender-cvs] [f2c5ff3] soc-2014-fluid: Fix merge error Streamline Python function name

Daniel Genrich noreply at git.blender.org
Thu Oct 23 16:46:47 CEST 2014


Commit: f2c5ff385dea1868e859c3c6a465535267afc770
Author: Daniel Genrich
Date:   Thu Oct 23 16:46:28 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBf2c5ff385dea1868e859c3c6a465535267afc770

Fix merge error
Streamline Python function name

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

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 7131bc2..032bfd3 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", BPyInit_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 c14e154..feba7c5 100644
--- a/source/blender/python/manta_pp/pwrapper/manta_api.cpp
+++ b/source/blender/python/manta_pp/pwrapper/manta_api.cpp
@@ -17,7 +17,7 @@ typedef string pyString;
 //#ifdef __cplusplus
 extern "C" {
 //#endif
-PyObject * PyInit_Manta(void)
+PyObject * BPyInit_manta(void)
 {
 	return Pb::PyInit_Main_Obj();
 }
diff --git a/source/blender/python/manta_pp/pwrapper/manta_api.h b/source/blender/python/manta_pp/pwrapper/manta_api.h
index 3fbfe6f..260f7b5 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 * PyInit_Manta(void);
+PyObject * BPyInit_manta(void);
 PyMODINIT_FUNC PyInit_Main_Link(void);
 #endif




More information about the Bf-blender-cvs mailing list