diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-19 06:48:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-19 06:48:09 +0400 |
commit | 822d6ae037e0cce734916e88ed00fdbd811edae1 (patch) | |
tree | c3b37852984d864edae79696023a5bf1d6b2fd65 /source/gameengine | |
parent | f3613be1fbfd764d829188b56ac17a3987161a77 (diff) |
- 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()
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 9 |
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; |