[Bf-blender-cvs] [601a1a3fdae] blender-v2.83-release: Fix T76185: GPencil from Curve ignores Cyclic when curve has only 2 points

Antonio Vazquez noreply at git.blender.org
Wed Apr 29 10:14:37 CEST 2020


Commit: 601a1a3fdae0bb87f6e6b54b594f0f685a94998a
Author: Antonio Vazquez
Date:   Wed Apr 29 10:14:20 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB601a1a3fdae0bb87f6e6b54b594f0f685a94998a

Fix T76185: GPencil from Curve ignores Cyclic when curve has only 2 points

Also changed default thickness to 10 because after draw engine refactor the final line was too thin.

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 874672f4a73..413e28c431b 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -1710,7 +1710,7 @@ static void gpencil_convert_spline(Main *bmain,
 
   /* Create Stroke. */
   bGPDstroke *gps = MEM_callocN(sizeof(bGPDstroke), "bGPDstroke");
-  gps->thickness = 1.0f;
+  gps->thickness = 10.0f;
   gps->fill_opacity_fac = 1.0f;
   gps->hardeness = 1.0f;
   gps->uv_scale = 1.0f;
@@ -1731,7 +1731,7 @@ static void gpencil_convert_spline(Main *bmain,
   int segments = 0;
   int resolu = nu->resolu + 1;
   segments = nu->pntsu;
-  if (((nu->flagu & CU_NURB_CYCLIC) == 0) || (nu->pntsu == 2)) {
+  if ((nu->flagu & CU_NURB_CYCLIC) == 0) {
     segments--;
     cyclic = false;
   }
@@ -1847,7 +1847,7 @@ static void gpencil_convert_spline(Main *bmain,
       int init = 0;
       resolu = nu->resolu + 1;
       segments = nu->pntsu;
-      if (((nu->flagu & CU_NURB_CYCLIC) == 0) || (nu->pntsu == 2)) {
+      if ((nu->flagu & CU_NURB_CYCLIC) == 0) {
         segments--;
       }
       /* Get all interpolated curve points of Beziert */



More information about the Bf-blender-cvs mailing list