[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36939] trunk/blender/source/blender: own recent commits caused crash with the grease pencil in camera view, always pass rv3d argument now.

Campbell Barton ideasman42 at gmail.com
Fri May 27 01:29:40 CEST 2011


Revision: 36939
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36939
Author:   campbellbarton
Date:     2011-05-26 23:29:40 +0000 (Thu, 26 May 2011)
Log Message:
-----------
own recent commits caused crash with the grease pencil in camera view, always pass rv3d argument now.
also found a bug where hex_to_rgb could use un-initialized memory.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_color.c
    trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/blenlib/intern/math_color.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color.c	2011-05-26 23:19:15 UTC (rev 36938)
+++ trunk/blender/source/blender/blenlib/intern/math_color.c	2011-05-26 23:29:40 UTC (rev 36939)
@@ -194,6 +194,10 @@
 		CLAMP(*g, 0.0f, 1.0f);
 		CLAMP(*b, 0.0f, 1.0f);
 	}
+	else {
+		/* avoid using un-initialized vars */
+		*r= *g= *b= 0.0f;
+	}
 }
 
 void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv)

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2011-05-26 23:19:15 UTC (rev 36938)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2011-05-26 23:29:40 UTC (rev 36939)
@@ -453,7 +453,7 @@
 
 		/* for camera view set the subrect */
 		if (rv3d->persp == RV3D_CAMOB) {
-			ED_view3d_calc_camera_border(scene, ar, v3d, NULL, subrect, -1); /* negative shift */
+			ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, subrect, -1); /* negative shift */
 			return 1;
 		}
 	}

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2011-05-26 23:19:15 UTC (rev 36938)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c	2011-05-26 23:29:40 UTC (rev 36939)
@@ -1131,7 +1131,7 @@
 
 			/* for camera view set the subrect */
 			if (rv3d->persp == RV3D_CAMOB) {
-				ED_view3d_calc_camera_border(p->scene, p->ar, v3d, NULL, &p->subrect_data, -1); /* negative shift */
+				ED_view3d_calc_camera_border(p->scene, p->ar, v3d, rv3d, &p->subrect_data, -1); /* negative shift */
 				p->subrect= &p->subrect_data;
 			}
 		}

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2011-05-26 23:19:15 UTC (rev 36938)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2011-05-26 23:29:40 UTC (rev 36939)
@@ -876,9 +876,6 @@
 	float dx= 0.0f, dy= 0.0f;
 	
 	view3d_viewborder_size_get(scene, ar, size);
-	
-	if (rv3d == NULL)
-		rv3d = ar->regiondata;
 
 	size[0]= size[0]*zoomfac;
 	size[1]= size[1]*zoomfac;




More information about the Bf-blender-cvs mailing list