[Bf-blender-cvs] [556d76c585c] greasepencil-object: GPencil: Some tweaks to Generate from Image operator

Antonio Vazquez noreply at git.blender.org
Sun Dec 8 13:57:45 CET 2019


Commit: 556d76c585c0f4085686efff46ef70d78efb85e5
Author: Antonio Vazquez
Date:   Sun Dec 8 13:57:39 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB556d76c585c0f4085686efff46ef70d78efb85e5

GPencil: Some tweaks to Generate from Image operator

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/gpencil/gpencil_convert.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 69a4fca1485..a55dd44bb0c 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3633,8 +3633,6 @@ bool BKE_gpencil_from_image(SpaceImage *sima, bGPDframe *gpf, const float size,
           pt->flag |= GP_SPOINT_SELECT;
         }
       }
-      /* Dissolve any selected point. */
-      BKE_gpencil_dissolve_points(gpf, gps, GP_SPOINT_SELECT);
     }
   }
 
diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c
index 11317491227..e4cd6017085 100644
--- a/source/blender/editors/gpencil/gpencil_convert.c
+++ b/source/blender/editors/gpencil/gpencil_convert.c
@@ -1792,6 +1792,13 @@ static int image_to_gpencil_exec(bContext *C, wmOperator *op)
   done = BKE_gpencil_from_image(sima, gpf, size, is_mask);
 
   if (done) {
+    /* Delete any selected point. */
+    bGPDstroke *gps, *gpsn;
+    for (gps = gpf->strokes.first; gps; gps = gpsn) {
+      gpsn = gps->next;
+      gp_stroke_delete_tagged_points(gpf, gps, gpsn, GP_SPOINT_SELECT, false, 0);
+    }
+
     BKE_reportf(op->reports, RPT_INFO, "Object created");
   }



More information about the Bf-blender-cvs mailing list