[Bf-blender-cvs] [c809722] GPencil_EditStrokes: Merge branch 'master' into GPencil_EditStrokes

Joshua Leung noreply at git.blender.org
Thu Oct 23 08:16:17 CEST 2014


Commit: c80972286ca100e7f9cdff8966cb7dc7fd8789b2
Author: Joshua Leung
Date:   Thu Oct 23 16:22:22 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBc80972286ca100e7f9cdff8966cb7dc7fd8789b2

Merge branch 'master' into GPencil_EditStrokes

Conflicts (Unresolved):
	source/blender/editors/gpencil/gpencil_paint.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index b8674b6,7c1976d..4c04a6f
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -891,9 -892,12 +892,15 @@@ bool gp_stroke_inside_circle(const int 
  	return false;
  } 
  
 -static void gp_point_to_xy(tGPsdata *p, bGPDstroke *gps, bGPDspoint *pt,
 -                           int *r_x, int *r_y)
++
 +void gp_point_to_xy(ARegion *ar, View2D *v2d, rctf *subrect, bGPDstroke *gps, bGPDspoint *pt,
 +                    int *r_x, int *r_y)
++//static void gp_point_to_xy(tGPsdata *p, bGPDstroke *gps, bGPDspoint *pt,
++//                           int *r_x, int *r_y)
  {
+ 	ARegion *ar = p->ar;
+ 	View2D *v2d = p->v2d;
+ 	rctf *subrect = p->subrect;
  	int xyval[2];
  
  	if (gps->flag & GP_STROKE_3DSPACE) {




More information about the Bf-blender-cvs mailing list