Revision: 36771 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36771 Author: blendix Date: 2011-05-19 11:18:09 +0000 (Thu, 19 May 2011) Log Message: ----------- UI: fix direction properties not showing the right direction editing widget, code was there but in the wrong location. This makes the opengl lights in the user preferences show that widget again as in 2.4.
Modified Paths: -------------- trunk/blender/source/blender/editors/interface/interface_layout.c Modified: trunk/blender/source/blender/editors/interface/interface_layout.c =================================================================== --- trunk/blender/source/blender/editors/interface/interface_layout.c 2011-05-19 11:13:35 UTC (rev 36770) +++ trunk/blender/source/blender/editors/interface/interface_layout.c 2011-05-19 11:18:09 UTC (rev 36771) @@ -418,6 +418,9 @@ but->type= NUMSLI; } } + else if(subtype == PROP_DIRECTION) { + uiDefButR(block, BUT_NORMAL, 0, name, x, y, UI_UNIT_X*3, UI_UNIT_Y*3, ptr, RNA_property_identifier(prop), 0, 0, 0, -1, -1, NULL); + } else { if(ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA) && !expand) uiDefAutoButR(block, ptr, prop, -1, "", ICON_NONE, 0, 0, w, UI_UNIT_Y); @@ -533,9 +536,6 @@ /* BUTTONS_OT_file_browse calls uiFileBrowseContextProperty */ but= uiDefIconButO(block, BUT, "BUTTONS_OT_file_browse", WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL); } - else if(subtype == PROP_DIRECTION) { - uiDefButR(block, BUT_NORMAL, 0, name, x, y, 100, 100, ptr, RNA_property_identifier(prop), index, 0, 0, -1, -1, NULL); - } else if(flag & UI_ITEM_R_EVENT) { uiDefButR(block, KEYEVT, 0, name, x, y, w, h, ptr, RNA_property_identifier(prop), index, 0, 0, -1, -1, NULL); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs