[Bf-blender-cvs] [de487a8b016] greasepencil-refactor: GPencil: Cleanup unused function

Antonio Vazquez noreply at git.blender.org
Sat Feb 1 16:00:09 CET 2020


Commit: de487a8b016b07b80e269bd99540a8db208d4514
Author: Antonio Vazquez
Date:   Sat Feb 1 15:59:04 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBde487a8b016b07b80e269bd99540a8db208d4514

GPencil: Cleanup unused function

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

M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/editors/gpencil/gpencil_sculpt_paint.c

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 3954da51719..275089e0beb 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1056,51 +1056,3 @@ void ED_gp_draw_fill(tGPDdraw *tgpw)
 {
   gp_draw_strokes(tgpw);
 }
-
-/* draw a short status message in the top-right corner */
-static void UNUSED_FUNCTION(gp_draw_status_text)(const bGPdata *gpd, ARegion *ar)
-{
-
-  /* Cannot draw any status text when drawing OpenGL Renders */
-  if (G.f & G_FLAG_RENDER_VIEWPORT) {
-    return;
-  }
-
-  /* Get bounds of region - Necessary to avoid problems with region overlap. */
-  const rcti *rect = ED_region_visible_rect(ar);
-
-  /* for now, this should only be used to indicate when we are in stroke editmode */
-  if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
-    const char *printable = IFACE_("GPencil Stroke Editing");
-    float printable_size[2];
-
-    int font_id = BLF_default();
-
-    BLF_width_and_height(
-        font_id, printable, BLF_DRAW_STR_DUMMY_MAX, &printable_size[0], &printable_size[1]);
-
-    int xco = (rect->xmax - U.widget_unit) - (int)printable_size[0];
-    int yco = (rect->ymax - U.widget_unit);
-
-    /* text label */
-    UI_FontThemeColor(font_id, TH_TEXT_HI);
-#ifdef WITH_INTERNATIONAL
-    BLF_draw_default(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
-#else
-    BLF_draw_default_ascii(xco, yco, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
-#endif
-
-    /* grease pencil icon... */
-    // XXX: is this too intrusive?
-    GPU_blend_set_func_separate(
-        GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
-    GPU_blend(true);
-
-    xco -= U.widget_unit;
-    yco -= (int)printable_size[1] / 2;
-
-    UI_icon_draw(xco, yco, ICON_GREASEPENCIL);
-
-    GPU_blend(false);
-  }
-}
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 41fbbbebe1e..5f9da601007 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1659,25 +1659,6 @@ void GPENCIL_OT_move_to_layer(wmOperatorType *ot)
 
 /* ********************* Add Blank Frame *************************** */
 
-/* Basically the same as the drawing op */
-static bool UNUSED_FUNCTION(gp_blank_frame_add_poll)(bContext *C)
-{
-  if (ED_operator_regionactive(C)) {
-    /* check if current context can support GPencil data */
-    if (ED_gpencil_data_get_pointers(C, NULL) != NULL) {
-      return 1;
-    }
-    else {
-      CTX_wm_operator_poll_msg_set(C, "Failed to find Grease Pencil data to draw into");
-    }
-  }
-  else {
-    CTX_wm_operator_poll_msg_set(C, "Active region not set");
-  }
-
-  return 0;
-}
-
 static int gp_blank_frame_add_exec(bContext *C, wmOperator *op)
 {
   bGPdata *gpd = ED_gpencil_data_get_active(C);
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 3ed380fe162..7d9c3b7785c 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -234,18 +234,6 @@ static void gp_primitive_update_cps(tGPDprimitive *tgpi)
   }
 }
 
-/* Helper to reflect point */
-static void UNUSED_FUNCTION(gp_reflect_point_v2_v2v2v2)(float va[2],
-                                                        const float p[2],
-                                                        const float a[2],
-                                                        const float b[2])
-{
-  float point[2];
-  closest_to_line_v2(point, p, a, b);
-  va[0] = point[0] - (p[0] - point[0]);
-  va[1] = point[1] - (p[1] - point[1]);
-}
-
 /* Poll callback for primitive operators */
 static bool gpencil_primitive_add_poll(bContext *C)
 {
diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c
index 53f99df44cf..9f718babc68 100644
--- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c
+++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c
@@ -913,63 +913,6 @@ static bool gp_brush_randomize_apply(tGP_BrushEditData *gso,
   return true;
 }
 
-/* Weight Paint Brush */
-/* Change weight paint for vertex groups */
-static bool UNUSED_FUNCTION(gp_brush_weight_apply)(tGP_BrushEditData *gso,
-                                                   bGPDstroke *gps,
-                                                   float UNUSED(rot_eval),
-                                                   int pt_index,
-                                                   const int radius,
-                                                   const int co[2])
-{
-  /* create dvert */
-  BKE_gpencil_dvert_ensure(gps);
-
-  MDeformVert *dvert = gps->dvert + pt_index;
-  float inf;
-
-  /* Compute strength of effect
-   * - We divide the strength by 10, so that users can set "sane" values.
-   *   Otherwise, good default values are in the range of 0.093
-   */
-  inf = gp_brush_influence_calc(gso, radius, co) / 10.0f;
-
-  /* need a vertex group */
-  if (gso->vrgroup == -1) {
-    if (gso->object) {
-      BKE_object_defgroup_add(gso->object);
-      DEG_relations_tag_update(gso->bmain);
-      gso->vrgroup = 0;
-    }
-  }
-  else {
-    bDeformGroup *defgroup = BLI_findlink(&gso->object->defbase, gso->vrgroup);
-    if (defgroup->flag & DG_LOCK_WEIGHT) {
-      return false;
-    }
-  }
-  /* get current weight */
-  MDeformWeight *dw = defvert_verify_index(dvert, gso->vrgroup);
-  float curweight = dw ? dw->weight : 0.0f;
-
-  if (gp_brush_invert_check(gso)) {
-    curweight -= inf;
-  }
-  else {
-    /* increase weight */
-    curweight += inf;
-    /* verify maximum target weight */
-    CLAMP_MAX(curweight, gso->brush->weight);
-  }
-
-  CLAMP(curweight, 0.0f, 1.0f);
-  if (dw) {
-    dw->weight = curweight;
-  }
-
-  return true;
-}
-
 /* ************************************************ */
 /* Non Callback-Based Brushes */
 /* Clone Brush ------------------------------------- */



More information about the Bf-blender-cvs mailing list