diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-12-25 00:53:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-25 00:53:15 +0300 |
| commit | aa56346b1264f1a37992834b37f47ab48fd97380 (patch) | |
| tree | e5ce919c2560575c1821e3ad2578f2b0d3cc61a5 | |
| parent | cbebe4ad46082198b5a59fd21efeb99b4e6fd7be (diff) | |
* disable back buffer selection drawing while projection painting (was redoing for every update while painting)
* remove unneeded return from game engines py api - ConvertPythonToGameObject
| -rw-r--r-- | source/blender/src/drawview.c | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 0942d5d1cdb..44b61c816a5 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -975,7 +975,8 @@ void backdrawview3d(int test) int m; #endif - if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT); + if( G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT ); + else if ((G.f & G_TEXTUREPAINT) && G.scene->toolsettings && (G.scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_DISABLE)==0); else if(G.obedit && G.vd->drawtype>OB_WIRE && (G.vd->flag & V3D_ZBUF_SELECT)); else { G.vd->flag &= ~V3D_NEEDBACKBUFDRAW; diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index e4a37b589a8..f2a554c6b2a 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -2082,7 +2082,6 @@ bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py PyErr_SetString(PyExc_TypeError, "Expected KX_GameObject or a string for a name of a KX_GameObject, None is invalid"); return false; } - return (py_none_ok ? true : false); } if (PyString_Check(value)) { |