[Bf-blender-cvs] [fcc91faf3f1] master: Fix (unreported) bad handling of undo for some IDTemplates operations.

Bastien Montagne noreply at git.blender.org
Mon Jul 13 17:03:45 CEST 2020


Commit: fcc91faf3f1a362b5e20029e61e0d1407d7befc5
Author: Bastien Montagne
Date:   Mon Jul 13 17:02:58 2020 +0200
Branches: master
https://developer.blender.org/rBfcc91faf3f1a362b5e20029e61e0d1407d7befc5

Fix (unreported) bad handling of undo for some IDTemplates operations.

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

M	source/blender/editors/interface/interface_templates.c

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

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ba3d2d29603..bd79dc9f986 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -569,6 +569,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
               /* Assign new pointer, takes care of updates/notifiers */
               RNA_id_pointer_create(override_id, &idptr);
             }
+            undo_push_label = "Make Library Override";
           }
         }
         else {
@@ -577,11 +578,11 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 
             /* reassign to get get proper updates/notifiers */
             idptr = RNA_property_pointer_get(&template_ui->ptr, template_ui->prop);
+            undo_push_label = "Make Local";
           }
         }
         RNA_property_pointer_set(&template_ui->ptr, template_ui->prop, idptr, NULL);
         RNA_property_update(C, &template_ui->ptr, template_ui->prop);
-        undo_push_label = "Make Local";
       }
       break;
     case UI_ID_OVERRIDE:



More information about the Bf-blender-cvs mailing list