[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14057] trunk/blender/source/blender: fix for cam.setScale(), cam.setClipStart(), cam.setClipEnd() and

Campbell Barton ideasman42 at gmail.com
Tue Mar 11 10:00:10 CET 2008


Revision: 14057
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14057
Author:   campbellbarton
Date:     2008-03-11 10:00:09 +0100 (Tue, 11 Mar 2008)

Log Message:
-----------
fix for cam.setScale(), cam.setClipStart(), cam.setClipEnd() and
cam.setDrawSize(), they would raise errors when setting ints. but used not to.
better tooltips for Uv Stretch

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Camera.c
    trunk/blender/source/blender/src/drawimage.c

Modified: trunk/blender/source/blender/python/api2_2x/Camera.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Camera.c	2008-03-11 05:31:50 UTC (rev 14056)
+++ trunk/blender/source/blender/python/api2_2x/Camera.c	2008-03-11 09:00:09 UTC (rev 14057)
@@ -1,5 +1,5 @@
 /* 
- * $Id: Camera.c 12078 2007-09-18 06:41:29Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
@@ -478,7 +478,7 @@
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -493,7 +493,7 @@
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -508,7 +508,7 @@
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -523,7 +523,7 @@
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 
@@ -538,7 +538,7 @@
 {
 	float param = PyFloat_AsDouble(value);
 
-	if( !PyFloat_Check(value) )
+	if (PyErr_Occurred())
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected float argument" );
 

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2008-03-11 05:31:50 UTC (rev 14056)
+++ trunk/blender/source/blender/src/drawimage.c	2008-03-11 09:00:09 UTC (rev 14057)
@@ -1492,11 +1492,11 @@
 		uiBlockEndAlign(block);
 		uiDefButBitI(block, TOG, SI_SMOOTH_UV, B_REDR, "Smooth",	250,40,60,19,  &G.sima->flag, 0, 0, 0, 0, "Display smooth lines in the UV view");
 		
-		uiDefButBitI(block, TOG, SI_DRAW_STRETCH, B_REDR, "UV Stretch",	10,0,100,19,  &G.sima->flag, 0, 0, 0, 0, "Display distortion between the UV's and the 3D coords");
+		uiDefButBitI(block, TOG, SI_DRAW_STRETCH, B_REDR, "UV Stretch",	10,0,100,19,  &G.sima->flag, 0, 0, 0, 0, "Difference between UV's and the 3D coords (blue for low distortion, red is high)");
 		
 		uiBlockBeginAlign(block);
-		uiDefButC(block,  ROW, B_REDR, "Area",			126,0,58,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_AREA, 0, 0, "Draw the area distortion");
-		uiDefButC(block,  ROW, B_REDR, "Angle",		184,0,58,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_ANGLE, 0, 0, "Draw the angle distortion");
+		uiDefButC(block,  ROW, B_REDR, "Area",			120,0,60,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_AREA, 0, 0, "Area distortion between UV's and 3D coords");
+		uiDefButC(block,  ROW, B_REDR, "Angle",		180,0,60,19, &G.sima->dt_uvstretch, 0.0, SI_UVDT_STRETCH_ANGLE, 0, 0, "Angle distortion between UV's and 3D coords");
 		uiBlockEndAlign(block);
 		
 	}





More information about the Bf-blender-cvs mailing list