Revision: 27700
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27700
Author: campbellbarton
Date: 2010-03-23 22:37:02 +0100 (Tue, 23 Mar 2010)
Log Message:
-----------
enable compiling without python again
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm.c 2010-03-23
20:41:19 UTC (rev 27699)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c 2010-03-23
21:37:02 UTC (rev 27700)
@@ -64,11 +64,14 @@
void WM_operator_free(wmOperator *op)
{
+
+#ifndef DISABLE_PYTHON
if(op->py_instance) {
/* do this first incase there are any __del__ functions or
* similar that use properties */
BPY_DECREF(op->py_instance);
}
+#endif
if(op->ptr) {
op->properties= op->ptr->data;
Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2010-03-23
20:41:19 UTC (rev 27699)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2010-03-23
21:37:02 UTC (rev 27700)
@@ -1309,8 +1309,10 @@
m_logger->StartLog(tc_rasterizer, m_kxsystem->GetTimeInSeconds(), true);
SG_SetActiveStage(SG_STAGE_RENDER);
+#ifndef DISABLE_PYTHON
// Run any pre-drawing python callbacks
scene->RunDrawingCallbacks(scene->GetPreDrawCB());
+#endif
scene->RenderBuckets(camtrans, m_rasterizer, m_rendertools);
@@ -1324,7 +1326,9 @@
{
m_rendertools->MotionBlur(m_rasterizer);
scene->Render2DFilters(m_canvas);
+#ifndef DISABLE_PYTHON
scene->RunDrawingCallbacks(scene->GetPostDrawCB());
+#endif
m_rasterizer->FlushDebugLines();
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2010-03-23 20:41:19 UTC
(rev 27699)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2010-03-23 21:37:02 UTC
(rev 27700)
@@ -407,34 +407,6 @@
return m_isclearingZbuffer;
}
-void KX_Scene::RunDrawingCallbacks(PyObject* cb_list)
-{
- int len;
-
- if (cb_list && (len=PyList_GET_SIZE(cb_list)))
- {
- PyObject* args= PyTuple_New(0); // save python creating each
call
- PyObject* func;
- PyObject* ret;
-
- // Iterate the list and run the callbacks
- for (int pos=0; pos < len; pos++)
- {
- func= PyList_GET_ITEM(cb_list, pos);
- ret= PyObject_Call(func, args, NULL);
- if (ret==NULL) {
- PyErr_Print();
- PyErr_Clear();
- }
- else {
- Py_DECREF(ret);
- }
- }
-
- Py_DECREF(args);
- }
-}
-
void KX_Scene::EnableZBufferClearing(bool isclearingZbuffer)
{
m_isclearingZbuffer = isclearingZbuffer;
@@ -1657,9 +1629,6 @@
return m_suspendeddelta;
}
-#ifndef DISABLE_PYTHON
-
-
#include "KX_BulletPhysicsController.h"
static void MergeScene_LogicBrick(SCA_ILogicBrick* brick, KX_Scene *to)
@@ -1855,6 +1824,36 @@
m_filtermanager.RenderFilters(canvas);
}
+#ifndef DISABLE_PYTHON
+
+void KX_Scene::RunDrawingCallbacks(PyObject* cb_list)
+{
+ int len;
+
+ if (cb_list && (len=PyList_GET_SIZE(cb_list)))
+ {
+ PyObject* args= PyTuple_New(0); // save python creating each
call
+ PyObject* func;
+ PyObject* ret;
+
+ // Iterate the list and run the callbacks
+ for (int pos=0; pos < len; pos++)
+ {
+ func= PyList_GET_ITEM(cb_list, pos);
+ ret= PyObject_Call(func, args, NULL);
+ if (ret==NULL) {
+ PyErr_Print();
+ PyErr_Clear();
+ }
+ else {
+ Py_DECREF(ret);
+ }
+ }
+
+ Py_DECREF(args);
+ }
+}
+
//----------------------------------------------------------------------------
//Python
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2010-03-23 20:41:19 UTC
(rev 27699)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2010-03-23 21:37:02 UTC
(rev 27700)
@@ -292,11 +292,6 @@
RAS_IRenderTools* rendertools);
/**
- * Run the registered python drawing functions.
- */
- void RunDrawingCallbacks(PyObject* cb_list);
-
- /**
* Update all transforms according to the scenegraph.
*/
static bool KX_ScenegraphUpdateFunc(SG_IObject* node,void*
gameobj,void* scene);
@@ -573,6 +568,11 @@
static PyMappingMethods Mapping;
static PySequenceMethods Sequence;
+ /**
+ * Run the registered python drawing functions.
+ */
+ void RunDrawingCallbacks(PyObject* cb_list);
+
PyObject* GetPreDrawCB() { return m_draw_call_pre; };
PyObject* GetPostDrawCB() { return m_draw_call_post; };
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
