[Bf-blender-cvs] [1aa70c9b21a] greasepencil-object: GPencil: Fix errors after merge

Antonio Vazquez noreply at git.blender.org
Fri Mar 6 17:52:21 CET 2020


Commit: 1aa70c9b21a4ab65867fb034889af85916e8b6e6
Author: Antonio Vazquez
Date:   Fri Mar 6 17:52:10 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1aa70c9b21a4ab65867fb034889af85916e8b6e6

GPencil: Fix errors after merge

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

M	source/blender/draw/intern/draw_cache_impl_gpencil.c
M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_sculpt_paint.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/gpencil/gpencil_uv.c
M	source/blender/editors/gpencil/gpencil_vertex_paint.c
M	source/blender/editors/gpencil/gpencil_weight_paint.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 2d6e12f7e88..c6cedd3f1d2 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -515,7 +515,7 @@ static void gpencil_sbuffer_stroke_ensure(bGPdata *gpd, bool do_stroke, bool do_
 
     const DRWContextState *draw_ctx = DRW_context_state_get();
     Scene *scene = draw_ctx->scene;
-    ARegion *ar = draw_ctx->ar;
+    ARegion *region = draw_ctx->region;
     Object *ob = draw_ctx->obact;
 
     BLI_assert(ob && (ob->type == OB_GPENCIL));
@@ -527,7 +527,7 @@ static void gpencil_sbuffer_stroke_ensure(bGPdata *gpd, bool do_stroke, bool do_
     ED_gpencil_drawing_reference_get(scene, ob, gpl, ts->gpencil_v3d_align, origin);
 
     for (int i = 0; i < vert_len; i++) {
-      ED_gpencil_tpoint_to_point(ar, origin, &tpoints[i], &gps->points[i]);
+      ED_gpencil_tpoint_to_point(region, origin, &tpoints[i], &gps->points[i]);
       mul_m4_v3(ob->imat, &gps->points[i].x);
       bGPDspoint *pt = &gps->points[i];
       copy_v4_v4(pt->vert_color, gpd->runtime.vert_color);
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index a30c57e2ea9..c928c1e933a 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -1503,7 +1503,7 @@ static int gpencil_fill_modal(bContext *C, wmOperator *op, const wmEvent *event)
           /* Perform bounds check */
           in_bounds = BLI_rcti_isect_pt(&region->winrct, event->x, event->y);
 
-          if ((in_bounds) && (ar->regiontype == RGN_TYPE_WINDOW)) {
+          if ((in_bounds) && (region->regiontype == RGN_TYPE_WINDOW)) {
             tgpf->center[0] = event->mval[0];
             tgpf->center[1] = event->mval[1];
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index d1be33b973d..d3c2e96c7be 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -693,7 +693,7 @@ static short gp_stroke_addpoint(tGPsdata *p, const float mval[2], float pressure
   BrushGpencilSettings *brush_settings = p->brush->gpencil_settings;
   tGPspoint *pt;
   Object *obact = (Object *)p->ownerPtr.data;
-  RegionView3D *rv3d = p->ar->regiondata;
+  RegionView3D *rv3d = p->region->regiondata;
 
   /* check painting mode */
   if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT) {
diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c
index 80ddeaf3f14..5cf4681c755 100644
--- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c
+++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c
@@ -519,7 +519,7 @@ static bool gp_brush_grab_store_points(tGP_BrushEditData *gso,
 static void gp_brush_grab_calc_dvec(tGP_BrushEditData *gso)
 {
   /* Convert mouse-movements to movement vector */
-  RegionView3D *rv3d = gso->ar->regiondata;
+  RegionView3D *rv3d = gso->region->regiondata;
   float *rvec = gso->object->loc;
   float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 
@@ -539,7 +539,7 @@ static void gp_brush_grab_calc_dvec(tGP_BrushEditData *gso)
     copy_v2_v2(mval_f, r);
   }
 
-  ED_view3d_win_to_delta(gso->ar, mval_f, gso->dvec, zfac);
+  ED_view3d_win_to_delta(gso->region, mval_f, gso->dvec, zfac);
 }
 
 /* Apply grab transform to all relevant points of the affected strokes */
@@ -637,19 +637,19 @@ static void gp_brush_calc_midpoint(tGP_BrushEditData *gso)
   /* Convert mouse position to 3D space
    * See: gpencil_paint.c :: gp_stroke_convertcoords()
    */
-  RegionView3D *rv3d = gso->ar->regiondata;
+  RegionView3D *rv3d = gso->region->regiondata;
   const float *rvec = gso->object->loc;
   float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 
-    float mval_f[2];
-    copy_v2_v2(mval_f, gso->mval);
-    float mval_prj[2];
-    float dvec[3];
+  float mval_f[2];
+  copy_v2_v2(mval_f, gso->mval);
+  float mval_prj[2];
+  float dvec[3];
 
-  if (ED_view3d_project_float_global(gso->ar, rvec, mval_prj, V3D_PROJ_TEST_NOP) ==
+  if (ED_view3d_project_float_global(gso->region, rvec, mval_prj, V3D_PROJ_TEST_NOP) ==
       V3D_PROJ_RET_OK) {
     sub_v2_v2v2(mval_f, mval_prj, mval_f);
-    ED_view3d_win_to_delta(gso->ar, mval_f, dvec, zfac);
+    ED_view3d_win_to_delta(gso->region, mval_f, dvec, zfac);
     sub_v3_v3v3(gso->dvec, rvec, dvec);
   }
   else {
@@ -844,11 +844,11 @@ static bool gp_brush_randomize_apply(tGP_BrushEditData *gso,
     if (gps->flag & GP_STROKE_3DSPACE) {
       /* 3D: Project to 3D space */
       bool flip;
-      RegionView3D *rv3d = gso->ar->regiondata;
+      RegionView3D *rv3d = gso->region->regiondata;
       float zfac = ED_view3d_calc_zfac(rv3d, &pt->x, &flip);
       if (flip == false) {
         float dvec[3];
-        ED_view3d_win_to_delta(gso->gsc.ar, svec, dvec, zfac);
+        ED_view3d_win_to_delta(gso->gsc.region, svec, dvec, zfac);
         add_v3_v3(&pt->x, dvec);
         /* compute lock axis */
         gpsculpt_compute_lock_axis(gso, pt, save_pt);
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index ed22569affd..a975af1c19a 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -929,7 +929,7 @@ void gp_stroke_convertcoords_tpoint(Scene *scene,
      * 3D-coordinates using the 3D-cursor as reference.
      */
     ED_gpencil_drawing_reference_get(scene, ob, gpl, ts->gpencil_v3d_align, rvec);
-    zfac = ED_view3d_calc_zfac(ar->regiondata, rvec, NULL);
+    zfac = ED_view3d_calc_zfac(region->regiondata, rvec, NULL);
 
     if (ED_view3d_project_float_global(region, rvec, mval_prj, V3D_PROJ_TEST_NOP) ==
         V3D_PROJ_RET_OK) {
@@ -1645,7 +1645,7 @@ static void gp_brush_cursor_draw(bContext *C, int x, int y, void *customdata)
 {
   Scene *scene = CTX_data_scene(C);
   Object *ob = CTX_data_active_object(C);
-  ARegion *ar = CTX_wm_region(C);
+  ARegion *region = CTX_wm_region(C);
   Paint *paint = BKE_paint_get_active_from_context(C);
 
   bGPdata *gpd = ED_gpencil_data_get_active(C);
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c
index b38b2d9fb7d..5e397374437 100644
--- a/source/blender/editors/gpencil/gpencil_uv.c
+++ b/source/blender/editors/gpencil/gpencil_uv.c
@@ -164,10 +164,10 @@ static bool gpencil_uv_transform_init(bContext *C, wmOperator *op, const bool is
   opdata->vinit_rotation[1] = 0.0f;
 
   if (is_modal) {
-    ARegion *ar = CTX_wm_region(C);
+    ARegion *region = CTX_wm_region(C);
 
     opdata->draw_handle_pixel = ED_region_draw_cb_activate(
-        ar->type, ED_region_draw_mouse_line_cb, opdata->mcenter, REGION_DRAW_POST_PIXEL);
+        region->type, ED_region_draw_mouse_line_cb, opdata->mcenter, REGION_DRAW_POST_PIXEL);
   }
 
   /* Calc selected strokes center. */
@@ -219,9 +219,9 @@ static void gpencil_uv_transform_exit(bContext *C, wmOperator *op)
   opdata = op->customdata;
 
   if (opdata->is_modal) {
-    ARegion *ar = CTX_wm_region(C);
+    ARegion *region = CTX_wm_region(C);
 
-    ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel);
+    ED_region_draw_cb_exit(region->type, opdata->draw_handle_pixel);
   }
 
   WM_cursor_set(CTX_wm_window(C), WM_CURSOR_DEFAULT);
diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c
index 5ea9a795286..02488dfa348 100644
--- a/source/blender/editors/gpencil/gpencil_vertex_paint.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c
@@ -98,7 +98,7 @@ typedef struct tGP_BrushVertexpaintData {
   Scene *scene;
   Object *object;
 
-  ARegion *ar;
+  ARegion *region;
 
   /* Current GPencil datablock */
   bGPdata *gpd;
@@ -749,7 +749,7 @@ static bool gp_vertexpaint_brush_init(bContext *C, wmOperator *op)
   gso->scene = scene;
   gso->object = ob;
 
-  gso->ar = CTX_wm_region(C);
+  gso->region = CTX_wm_region(C);
 
   /* Save mask. */
   gso->mask = ts->gpencil_selectmode_vertex;
@@ -1256,14 +1256,14 @@ static int gp_vertexpaint_brush_invoke(bContext *C, wmOperator *op, const wmEven
 
   /* start drawing immediately? */
   if (is_modal == false) {
-    ARegion *ar = CTX_wm_region(C);
+    ARegion *region = CTX_wm_region(C);
 
     /* apply first dab... */
     gso->is_painting = true;
     gp_vertexpaint_brush_apply_event(C, op, event);
 
     /* redraw view with feedback */
-    ED_region_tag_redraw(ar);
+    ED_region_tag_redraw(region);
   }
 
   return OPERATOR_RUNNING_MODAL;
@@ -1373,8 +1373,7 @@ static int gp_vertexpaint_brush_modal(bContext *C, wmOperator *op, const wmEvent
 
   /* Redraw region? */
   if (redraw_region) {
-    ARegion *ar = CTX_wm_region(C);
-    ED_region_tag_redraw(ar);
+    ED_region_tag_redraw(CTX_wm_region(C));
   }
 
   /* Redraw toolsettings (brush settings)? */
diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c
index 9f96d4ff790..6b337afa559 100644
--- a/source/blender/editors/gpencil/gpencil_weight_paint.c
+++ b/source/blender/editors/gpencil/gpencil_weight_paint.c
@@ -94,7 +94,7 @@ typedef struct tGP_BrushWeightpaintData {
   Scene *scene;
   Object *object;
 
-  ARegion *ar;
+  ARegion *region;
 
   /* Current GPencil datablock */
   bGPdata *gpd;
@@ -317,7 +317,7 @@ static bool gp_weightpaint_brush_init(bContext *C, wmOperator *op)
     gso->vrgroup = -1;
   }
 
-  gso->ar = CTX_wm_region(C);
+  gso->region = CTX_wm_region(C);
 
   /* Multiframe settings. */
   gso->is_multiframe = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gso->gpd);
@@ -745,14 +745,14 @@ static int gp_weightpaint_brush_invoke(bContext *C, wmOperator *op, const wmEven
 
   /* start drawing immediately? */
   if (is_modal == false) {
-    ARegion *ar = CTX_wm_region(C);
+    ARegion *region = CTX_wm_region(C);
 
     /* apply first dab... */
     gso->is_painting = true;
     gp_weightpaint_brush_apply_event(C, op, event);
 
     /* redraw view with feedback */
-    ED_region_tag_redraw(ar);
+    ED_region_tag_redraw(re

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list