kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Setting frame in python allowed negative numbers (was casting to a short with no clamping!)

Browse Source 
disable capslock option isnt used anywhere.
This commit is contained in:
Campbell Barton 2008-05-07 07:57:18 +00:00
parent 4aa8dd0b63
commit 5e493eeb19
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/python/api2_2x/Blender.c
View File

@ -246,7 +246,8 @@ static PyObject *Blender_Set( PyObject * self, PyObject * args )
return EXPP_ReturnPyObjError( PyExc_ValueError, return EXPP_ReturnPyObjError( PyExc_ValueError,
"expected an integer" ); "expected an integer" );
G.scene->r.cfra = (short)PyInt_AsLong( arg ) ; G.scene->r.cfra = (int)PyInt_AsLong( arg ) ;
CLAMP(G.scene->r.cfra, 1, MAXFRAME);
/* update all objects, so python scripts can export all objects /* update all objects, so python scripts can export all objects
in a scene without worrying about the view layers */ in a scene without worrying about the view layers */

9
source/blender/src/space.c
View File

@ -4163,16 +4163,17 @@ void drawinfospace(ScrArea *sa, void *spacedata)
&(G.f), 0, 0, 0, 0, "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)"); &(G.f), 0, 0, 0, 0, "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)");
uiDefBut(block, LABEL,0,"Keyboard:", uiDefBut(block, LABEL,0,"Keyboard:",
(xpos+edgsp+(3*midsp)+(3*mpref)),y3label,mpref,buth, (xpos+edgsp+(3*midsp)+(3*mpref)),y2label,mpref,buth,
0, 0, 0, 0, 0, ""); 0, 0, 0, 0, 0, "");
/* Not actually used anywhere! */
/*
uiDefButBitI(block, TOG, USER_NO_CAPSLOCK, B_U_CAPSLOCK, "Disable Caps Lock", uiDefButBitI(block, TOG, USER_NO_CAPSLOCK, B_U_CAPSLOCK, "Disable Caps Lock",
(xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth, (xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth,
&(U.flag), 0, 0, 0, 0, &(U.flag), 0, 0, 0, 0,
"Disables the Caps Lock key when entering text"); "Disables the Caps Lock key when entering text");
*/
uiDefButBitI(block, TOG, USER_NONUMPAD, 0, "Emulate Numpad", uiDefButBitI(block, TOG, USER_NONUMPAD, 0, "Emulate Numpad",
(xpos+edgsp+(3*midsp)+(3*mpref)),y2,mpref,buth, (xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth,
&(U.flag), 0, 0, 0, 0, &(U.flag), 0, 0, 0, 0,
"Causes the 1 to 0 keys to act as the numpad (useful for laptops)"); "Causes the 1 to 0 keys to act as the numpad (useful for laptops)");