Setting frame in python allowed negative numbers (was casting to a short with no...

disable capslock option isnt used anywhere.

diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 7c2895d96be8ab0b22032896f4ef00bf5f935cf3..4fc68d138e06b9e60972b4dd3a219a99a58e5464 100644 (file)
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -246,7 +246,8 @@ static PyObject *Blender_Set( PyObject * self, PyObject * args )
                        return EXPP_ReturnPyObjError( PyExc_ValueError,
                                        "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
                 in a scene without worrying about the view layers */

diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 3cffed48224962076eb071fba852db342c78b69b..292b1f1bc1e343eb7dd06823ea1208d932d84f79 100644 (file)
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -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)");
                
                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, "");
-
+               /* Not actually used anywhere! */
+               /*
                uiDefButBitI(block, TOG, USER_NO_CAPSLOCK, B_U_CAPSLOCK, "Disable Caps Lock",
                        (xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth,
                        &(U.flag), 0, 0, 0, 0,
                        "Disables the Caps Lock key when entering text");
-
+               */
                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,
                        "Causes the 1 to 0 keys to act as the numpad (useful for laptops)");