[Bf-blender-cvs] [67b352f9c53] master: Fix T87486: Can't open file with modifiers to a grease pencil library override

Bastien Montagne noreply at git.blender.org
Thu Jun 24 12:19:28 CEST 2021


Commit: 67b352f9c5317c81c8e862a49be656c56e8f0743
Author: Bastien Montagne
Date:   Thu Jun 24 12:10:38 2021 +0200
Branches: master
https://developer.blender.org/rB67b352f9c5317c81c8e862a49be656c56e8f0743

Fix T87486: Can't open file with modifiers to a grease pencil library override

Very stupid typo in override apply code on GP modifiers (typical
copy/paste mistake from original modifiers code).

@jbakker this should be back-ported to 2.93LTS.

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

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

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

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 3d3faf0c56f..a208e520d02 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1882,7 +1882,7 @@ bool rna_Object_greasepencil_modifiers_override_apply(Main *bmain,
   GpencilModifierData *mod_dst = ED_object_gpencil_modifier_add(
       NULL, bmain, NULL, ob_dst, mod_src->name, mod_src->type);
 
-  BLI_remlink(&ob_dst->modifiers, mod_dst);
+  BLI_remlink(&ob_dst->greasepencil_modifiers, mod_dst);
   /* This handles NULL anchor as expected by adding at head of list. */
   BLI_insertlinkafter(&ob_dst->greasepencil_modifiers, mod_anchor, mod_dst);



More information about the Bf-blender-cvs mailing list