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)) {