[Bf-blender-cvs] [a9194f061e3] greasepencil-refactor: GPencil: Rename masking layer references when rename mask layer

Antonio Vazquez noreply at git.blender.org
Sat Feb 8 10:46:39 CET 2020


Commit: a9194f061e39fd86e8f3f26ffdf922f8a17f417e
Author: Antonio Vazquez
Date:   Sat Feb 8 10:46:31 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBa9194f061e39fd86e8f3f26ffdf922f8a17f417e

GPencil: Rename masking layer references when rename mask layer

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

M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index e4402a51ca7..724e1dc2027 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -464,6 +464,13 @@ static void rna_GPencilLayer_info_set(PointerRNA *ptr, const char *value)
 
   /* now fix animation paths */
   BKE_animdata_fix_paths_rename_all(&gpd->id, "layers", oldname, gpl->info);
+
+  /* Fix mask layer. */
+  LISTBASE_FOREACH (bGPDlayer *, gpl_, &gpd->layers) {
+    if ((gpl_->mask_layer[0] != '\0') && STREQ(gpl_->mask_layer, oldname)) {
+      BLI_strncpy(gpl_->mask_layer, gpl->info, sizeof(gpl_->mask_layer));
+    }
+  }
 }
 
 static void rna_GPencil_layer_mask_set(PointerRNA *ptr, const bool value)



More information about the Bf-blender-cvs mailing list