[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56496] trunk/blender/source/blender/ editors/interface/interface_templates.c: revert part of own commit r56476, caused scene unlink button to be removed.

[Campbell Barton]

Revision: 56496
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56496
Author:   campbellbarton
Date:     2013-05-04 22:29:33 +0000 (Sat, 04 May 2013)
Log Message:
-----------
revert part of own commit r56476, caused scene unlink button to be removed.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56476

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-05-04 21:12:23 UTC (rev 56495)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-05-04 22:29:33 UTC (rev 56496)
@@ -577,7 +577,8 @@
 	}
 	
 	/* delete button */
-	if (id && (flag & UI_ID_DELETE) && RNA_property_is_unlink(template->prop)) {
+	/* don't use RNA_property_is_unlink here */
+	if (id && (flag & UI_ID_DELETE) && (RNA_property_flag(template->prop) & PROP_NEVER_UNLINK) == 0) {
 		if (unlinkop) {
 			but = uiDefIconButO(block, BUT, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
 			/* so we can access the template from operators, font unlinking needs this */