Commit: 8dd2386a6834e13de69c7e4c4abc58f0d9cdeedb
Author: Bastien Montagne
Date: Mon Jul 13 17:43:22 2020 +0200
Branches: master
https://developer.blender.org/rB8dd2386a6834e13de69c7e4c4abc58f0d9cdeedb
IDTemplate: Minor tweak to 'make local/override' code.
Only update pointer of the template if we actually changed it...
===================================================================
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 bd79dc9f986..7502652c262 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -581,8 +581,10 @@ static void template_id_cb(bContext *C, void *arg_litem,
void *arg_event)
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);
+ if (undo_push_label != NULL) {
+ RNA_property_pointer_set(&template_ui->ptr, template_ui->prop,
idptr, NULL);
+ RNA_property_update(C, &template_ui->ptr, template_ui->prop);
+ }
}
break;
case UI_ID_OVERRIDE:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
