- rename MovieTrackingMarker.enabled --> mute, to match constraints/nla/fcurves/sequencer

- report an error if an invalid BGpic arg is given to v3d.background_images.remove()

1 files changed, 6 insertions, 3 deletions

diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 682b42cc3cf..b1e3737af07 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -1362,14 +1362,17 @@ KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" )
 	
 	int attr=0;
 	
-	if(!PyArg_ParseTuple(args, "i:setAttrib", &attr ))
+	if(!PyArg_ParseTuple(args, "i:setAttrib", &attr))
 		return NULL;
-	
+
+	attr= SHD_TANGENT; /* user input is ignored for now, there is only 1 attr */
+
 	if(mShader==0) {
 		PyErr_SetString(PyExc_ValueError, "shader.setAttrib() BL_Shader, invalid shader object");
 		return NULL;
 	}
-	mAttr=SHD_TANGENT; /* What the heck is going on here - attr is just ignored??? - Campbell */
+
+	mAttr= attr;
 	glUseProgramObjectARB(mShader);
 	glBindAttribLocationARB(mShader, mAttr, "Tangent");
 	Py_RETURN_NONE;