[Bf-blender-cvs] [ad148e4fda5] temp-T97352-3d-texturing-seam-bleeding-b2: GPencil: Dot-dash modifier rename segment bug fix.

YimingWu noreply at git.blender.org
Mon Jul 11 15:36:22 CEST 2022


Commit: ad148e4fda589a67c26584ce3550d3ccacabb5e2
Author: YimingWu
Date:   Mon Jul 11 10:12:49 2022 +0800
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBad148e4fda589a67c26584ce3550d3ccacabb5e2

GPencil: Dot-dash modifier rename segment bug fix.

This patch fixes naming and renaming issue with dot-dash modifier segment list.

Before: when double clicking and exiting it would append
number at the end regardless of name being changed or not.

Now it works like in other areas.

Authored by: Aleš Jelovčan (frogstomp)

Reviewed By: YimingWu (NicksBest)

Differential Revision: https://developer.blender.org/D15359

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

M	release/scripts/addons
M	source/blender/makesrna/intern/rna_gpencil_modifier.c
M	source/tools

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 403b95ef6ff..7ea2e74fc41 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 403b95ef6ff38918de966ed2a5843cfa3274a58b
+Subproject commit 7ea2e74fc41b2eabdbf639b812082e73823b09d7
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index dccf7d7a7a9..d3e1aab1ba0 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -774,7 +774,7 @@ static bool dash_segment_name_exists_fn(void *arg, const char *name)
 {
   const DashGpencilModifierData *dmd = (const DashGpencilModifierData *)arg;
   for (int i = 0; i < dmd->segments_len; i++) {
-    if (STREQ(dmd->segments[i].name, name)) {
+    if (STREQ(dmd->segments[i].name, name) && dmd->segments[i].name != name) {
       return true;
     }
   }
diff --git a/source/tools b/source/tools
index 01b4c0e4a17..da8bdd7244c 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 01b4c0e4a172819414229445c314be34527bf412
+Subproject commit da8bdd7244c7b6c2eadf4c949ff391d0cc430275



More information about the Bf-blender-cvs mailing list