[Bf-blender-cvs] [94130eff349] greasepencil-object: Fix stabilizer cursor line drawing

Antonio Vazquez noreply at git.blender.org
Sat May 12 16:50:07 CEST 2018


Commit: 94130eff349b78f67844aeb480497e6a8798589e
Author: Antonio Vazquez
Date:   Sat May 12 16:49:59 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB94130eff349b78f67844aeb480497e6a8798589e

Fix stabilizer cursor line drawing

The cursor line was not correct because it was not using the Region visible rectangle and the line to last stroke point was adjusted as the stroke.

===================================================================

M	source/blender/editors/gpencil/gpencil_utils.c
M	source/tools

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index f840fba4195..a17eebb1b2b 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1375,6 +1375,7 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *customdata)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
+	ARegion *ar = CTX_wm_region(C);
 
 	GP_BrushEdit_Settings *gset = &scene->toolsettings->gp_sculpt;
 	bGPdata *gpd = ED_gpencil_data_get_active(C);
@@ -1512,7 +1513,8 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *customdata)
 
 		immBegin(GWN_PRIM_LINES, 2);
 		immVertex2f(pos, x, y);
-		immVertex2f(pos, last_mouse_position[0], last_mouse_position[1]);
+		immVertex2f(pos, last_mouse_position[0] + ar->winrct.xmin, 
+						 last_mouse_position[1] + ar->winrct.ymin);
 		immEnd();
 
 		glDisable(GL_BLEND);
diff --git a/source/tools b/source/tools
index 6bcd05cf6aa..b11375e8906 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 6bcd05cf6aaafae07b8a15313d7fdda1471ff59e
+Subproject commit b11375e89061303401376f7aeae42ac2fd64692a



More information about the Bf-blender-cvs mailing list