[Bf-blender-cvs] [796c3c7] master: Fix T44290: Clear users & fake-user conflict

Campbell Barton noreply at git.blender.org
Tue Apr 7 23:31:58 CEST 2015


Commit: 796c3c774820edf70572a6717ceb6c188a267577
Author: Campbell Barton
Date:   Wed Apr 8 06:50:38 2015 +1000
Branches: master
https://developer.blender.org/rB796c3c774820edf70572a6717ceb6c188a267577

Fix T44290: Clear users & fake-user conflict

The purpose of clearing users in this case is not to save the data,
so keeping fake-user doesn't make sense.

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

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 c4158fe..c36d25b 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -273,8 +273,11 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 			RNA_property_pointer_set(&template->ptr, template->prop, idptr);
 			RNA_property_update(C, &template->ptr, template->prop);
 
-			if (id && CTX_wm_window(C)->eventstate->shift) /* useful hidden functionality, */
+			if (id && CTX_wm_window(C)->eventstate->shift) {
+				/* only way to force-remove data (on save) */
+				id->flag &= ~LIB_FAKEUSER;
 				id->us = 0;
+			}
 
 			break;
 		case UI_ID_FAKE_USER:




More information about the Bf-blender-cvs mailing list