[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50897] trunk/blender/source/blender/ editors/gpencil/drawgpencil.c: fix [#32661] Grease Pencil in Camera View

Campbell Barton ideasman42 at gmail.com
Wed Sep 26 09:37:12 CEST 2012


Revision: 50897
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50897
Author:   campbellbarton
Date:     2012-09-26 07:37:12 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
fix [#32661] Grease Pencil in Camera View

Regression since 2.63a release.

own fault in r49996, though code was confusing - using rcti struct for offset+width.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49996

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/drawgpencil.c

Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c	2012-09-25 23:41:32 UTC (rev 50896)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c	2012-09-26 07:37:12 UTC (rev 50897)
@@ -757,8 +757,8 @@
 {
 	bGPdata *gpd;
 	int dflag = 0;
-	rcti rect;
 	RegionView3D *rv3d = ar->regiondata;
+	int offsx,  offsy,  winx,  winy;
 
 	/* check that we have grease-pencil stuff to draw */
 	gpd = gpencil_data_get_active_v3d(scene); // XXX
@@ -769,19 +769,23 @@
 	if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) {
 		rctf rectf;
 		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &rectf, TRUE); /* no shift */
-		BLI_rcti_rctf_copy(&rect, &rectf);
+
+		offsx = floorf(rectf.xmin + 0.5f);
+		offsy = floorf(rectf.ymin + 0.5f);
+		winx  = floorf((rectf.xmax - rectf.xmin) + 0.5f);
+		winy  = floorf((rectf.ymax - rectf.ymin) + 0.5f);
 	}
 	else {
-		rect.xmin = 0;
-		rect.ymin = 0;
-		rect.xmax = ar->winx;
-		rect.ymax = ar->winy;
+		offsx = 0;
+		offsy = 0;
+		winx  = ar->winx;
+		winy  = ar->winy;
 	}
 	
 	/* draw it! */
 	if (only3d) dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS);
 
-	gp_draw_data(gpd, rect.xmin, rect.ymin, rect.xmax, rect.ymax, CFRA, dflag);
+	gp_draw_data(gpd, offsx, offsy, winx, winy, CFRA, dflag);
 }
 
 /* ************************************************** */




More information about the Bf-blender-cvs mailing list