Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-04-29 11:14:55 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-04-29 11:14:55 +0300
commit770605312fca5a2c8a5838d9a05162c8fe904a05 (patch)
tree6dd545592e1a92914f5f9a196bb48c481a9c7692 /source/blender/blenkernel
parent21ef8c4d44f4a533d20611556adbf8750e3cf849 (diff)
parent601a1a3fdae0bb87f6e6b54b594f0f685a94998a (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/gpencil_geom.c6
1 files changed, 3 insertions, 3 deletions
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 */