[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56463] trunk/blender/source/blender: don' t show an 'X' next to never-null pointer search menus.

[Campbell Barton]

Revision: 56463
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56463
Author:   campbellbarton
Date:     2013-05-02 04:16:41 +0000 (Thu, 02 May 2013)
Log Message:
-----------
don't show an 'X' next to never-null pointer search menus.
also set ShapeKey.relative_key to never-null.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/makesrna/intern/rna_key.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2013-05-02 02:39:30 UTC (rev 56462)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2013-05-02 04:16:41 UTC (rev 56463)
@@ -1411,7 +1411,7 @@
 
 	/* turn button into search button */
 	if (searchprop) {
-		if (RNA_property_flag(prop) & PROP_NEVER_UNLINK)
+		if (RNA_property_flag(prop) & (PROP_NEVER_UNLINK | PROP_NEVER_NULL))
 			but->type = SEARCH_MENU;
 		else
 			but->type = SEARCH_MENU_UNLINK;

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-05-02 02:39:30 UTC (rev 56462)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-05-02 04:16:41 UTC (rev 56463)
@@ -577,7 +577,9 @@
 	}
 	
 	/* delete button */
-	if (id && (flag & UI_ID_DELETE) && (RNA_property_flag(template->prop) & PROP_NEVER_UNLINK) == 0) {
+	if (id && (flag & UI_ID_DELETE) &&
+	    (RNA_property_flag(template->prop) & (PROP_NEVER_UNLINK | PROP_NEVER_NULL)) == 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 */

Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_key.c	2013-05-02 02:39:30 UTC (rev 56462)
+++ trunk/blender/source/blender/makesrna/intern/rna_key.c	2013-05-02 04:16:41 UTC (rev 56463)
@@ -572,7 +572,7 @@
 
 	prop = RNA_def_property(srna, "relative_key", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ShapeKey");
-	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
 	RNA_def_property_pointer_funcs(prop, "rna_ShapeKey_relative_key_get",
 	                               "rna_ShapeKey_relative_key_set", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Relative Key", "Shape used as a relative key");