[Bf-blender-cvs] [8dcb1e9] master: Fix another part of T39692 Text fields in datablocks editor are broken.

Bastien Montagne noreply at git.blender.org
Sun Apr 27 22:01:15 CEST 2014


Commit: 8dcb1e9f70762e3542fcee5fea81c0a947229c17
Author: Bastien Montagne
Date:   Sun Apr 27 21:58:56 2014 +0200
https://developer.blender.org/rB8dcb1e9f70762e3542fcee5fea81c0a947229c17

Fix another part of T39692 Text fields in datablocks editor are broken.

Broken enums widgets was a sequel of rBe5e0888a8f02 (when we want auto-naming,
we have to pass NULL, not and empty string!).

Now remains the RNApointers issue...

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 4db63a4..b5d4481 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -757,7 +757,7 @@ static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, Spa
 				prop = te->directdata;
 				
 				if (!(RNA_property_type(prop) == PROP_POINTER && (TSELEM_OPEN(tselem, soops)))) {
-					uiDefAutoButR(block, ptr, prop, -1, "", ICON_NONE, sizex, te->ys, OL_RNA_COL_SIZEX,
+					uiDefAutoButR(block, ptr, prop, -1, NULL, ICON_NONE, sizex, te->ys, OL_RNA_COL_SIZEX,
 					              UI_UNIT_Y - 1);
 				}
 			}
@@ -765,7 +765,7 @@ static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, Spa
 				ptr = &te->rnaptr;
 				prop = te->directdata;
 				
-				uiDefAutoButR(block, ptr, prop, te->index, "", ICON_NONE, sizex, te->ys, OL_RNA_COL_SIZEX,
+				uiDefAutoButR(block, ptr, prop, te->index, NULL, ICON_NONE, sizex, te->ys, OL_RNA_COL_SIZEX,
 				              UI_UNIT_Y - 1);
 			}
 		}




More information about the Bf-blender-cvs mailing list