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

Antonio Vazquez noreply at git.blender.org
Fri Jan 31 19:23:09 CET 2020


Commit: 80290684a35aa1c54bffcf39d469eb031131376e
Author: Antonio Vazquez
Date:   Fri Jan 31 19:18:37 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB80290684a35aa1c54bffcf39d469eb031131376e

GPencil: Cleanup unused function

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

M	source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 056a80ac151..dd4d869c651 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -762,85 +762,6 @@ static void gpencil_assign_object_eval(Object *object)
 }
 
 /* Helper: Copy active frame from original datablock to evaluated datablock for modifiers. */
-static void gpencil_copy_activeframe_to_eval_ex(
-    Depsgraph *depsgraph, Scene *scene, Object *ob, bGPdata *gpd_orig, bGPdata *gpd_eval)
-{
-  /* Copy all relevant data of the datablock. */
-  MEM_SAFE_FREE(gpd_eval->mat);
-  gpd_eval->mat = MEM_dupallocN(gpd_orig->mat);
-
-  gpd_eval->flag = gpd_orig->flag;
-  gpd_eval->pixfactor = gpd_orig->pixfactor;
-  copy_v4_v4(gpd_eval->line_color, gpd_orig->line_color);
-  gpd_eval->onion_factor = gpd_orig->onion_factor;
-  gpd_eval->onion_mode = gpd_orig->onion_mode;
-  gpd_eval->onion_flag = gpd_orig->onion_flag;
-  gpd_eval->gstep = gpd_orig->gstep;
-  gpd_eval->gstep_next = gpd_orig->gstep_next;
-  copy_v3_v3(gpd_eval->gcolor_prev, gpd_orig->gcolor_prev);
-  copy_v3_v3(gpd_eval->gcolor_next, gpd_orig->gcolor_next);
-  gpd_eval->zdepth_offset = gpd_orig->zdepth_offset;
-  gpd_eval->totcol = gpd_orig->totcol;
-  gpd_eval->totlayer = gpd_orig->totlayer;
-  gpd_eval->totframe = gpd_orig->totframe;
-  gpd_eval->totstroke = gpd_orig->totstroke;
-  gpd_eval->totpoint = gpd_orig->totpoint;
-  gpd_eval->draw_mode = gpd_orig->draw_mode;
-  gpd_eval->onion_keytype = gpd_orig->onion_keytype;
-
-  /* Assign (can be NULL if reuse eval copy done by depsgraph). */
-  if (ob->runtime.gpd_eval != NULL) {
-    ob->data = ob->runtime.gpd_eval;
-  }
-
-  int layer_index = -1;
-  LISTBASE_FOREACH (bGPDlayer *, gpl_orig, &gpd_orig->layers) {
-    layer_index++;
-
-    int remap_cfra = gpencil_remap_time_get(depsgraph, scene, ob, gpl_orig);
-    bGPDframe *gpf_orig = BKE_gpencil_layer_frame_get(gpl_orig, remap_cfra, GP_GETFRAME_USE_PREV);
-    if (gpf_orig == NULL) {
-      continue;
-    }
-    int gpf_index = BLI_findindex(&gpl_orig->frames, gpf_orig);
-
-    bGPDlayer *gpl_eval = BLI_findlink(&gpd_eval->layers, layer_index);
-    if (gpl_eval == NULL) {
-      continue;
-    }
-    /* Copy all relevant data of the layer. */
-    gpl_eval->flag = gpl_orig->flag;
-    gpl_eval->onion_flag = gpl_orig->onion_flag;
-    copy_v4_v4(gpl_eval->color, gpl_orig->color);
-    copy_v4_v4(gpl_eval->fill, gpl_orig->fill);
-    BLI_strncpy(gpl_eval->info, gpl_orig->info, sizeof(gpl_eval->info));
-    gpl_eval->thickness = gpl_orig->thickness;
-    gpl_eval->pass_index = gpl_orig->pass_index;
-    gpl_eval->parent = gpl_orig->parent;
-    copy_m4_m4(gpl_eval->inverse, gpl_orig->inverse);
-    BLI_strncpy(gpl_eval->parsubstr, gpl_orig->parsubstr, sizeof(gpl_eval->parsubstr));
-    gpl_eval->partype = gpl_orig->partype;
-    gpl_eval->line_change = gpl_orig->line_change;
-    copy_v4_v4(gpl_eval->tintcolor, gpl_orig->tintcolor);
-    gpl_eval->opacity = gpl_orig->opacity;
-    BLI_strncpy(gpl_eval->viewlayername, gpl_orig->viewlayername, sizeof(gpl_eval->viewlayername));
-    gpl_eval->blend_mode = gpl_orig->blend_mode;
-    gpl_eval->vertex_paint_opacity = gpl_orig->vertex_paint_opacity;
-
-    bGPDframe *gpf_eval = BLI_findlink(&gpl_eval->frames, gpf_index);
-
-    if ((gpf_orig != NULL) && (gpf_eval != NULL)) {
-      /* Delete old strokes. */
-      BKE_gpencil_free_strokes(gpf_eval);
-      /* Copy again strokes. */
-      BKE_gpencil_frame_copy_strokes(gpf_orig, gpf_eval);
-
-      gpf_eval->runtime.gpf_orig = (bGPDframe *)gpf_orig;
-      BKE_gpencil_frame_original_pointers_update(gpf_orig, gpf_eval);
-    }
-  }
-}
-
 static void gpencil_copy_activeframe_to_eval(
     Depsgraph *depsgraph, Scene *scene, Object *ob, bGPdata *gpd_orig, bGPdata *gpd_eval)
 {



More information about the Bf-blender-cvs mailing list