Revision: 39191
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39191
Author: nazgul
Date: 2011-08-08 17:35:22 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Merging r39179 through r39190 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39179
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39190
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-39178
+ /trunk/blender:36831-39190
Modified:
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
2011-08-08 17:30:19 UTC (rev 39190)
+++
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
2011-08-08 17:35:22 UTC (rev 39191)
@@ -2745,6 +2745,25 @@
uiItemL(layout, "* Redo Unsupported *", ICON_NONE); // XXX,
could give some nicer feedback or not show redo panel at all?
}
+ /* menu */
+ if(op->type->flag & OPTYPE_PRESET) {
+ /* XXX, no simple way to get WM_MT_operator_presets.bl_label
from python! Label remains the same always! */
+ PointerRNA op_ptr;
+ uiLayout *row;
+
+ row= uiLayoutRow(layout, TRUE);
+ uiItemM(row, (bContext *)C, "WM_MT_operator_presets", NULL,
ICON_NONE);
+
+ WM_operator_properties_create(&op_ptr,
"WM_OT_operator_preset_add");
+ RNA_string_set(&op_ptr, "operator", op->type->idname);
+ op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add", "",
ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
+
+ WM_operator_properties_create(&op_ptr,
"WM_OT_operator_preset_add");
+ RNA_string_set(&op_ptr, "operator", op->type->idname);
+ RNA_boolean_set(&op_ptr, "remove_active", 1);
+ op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add", "",
ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
+ }
+
if(op->type->ui) {
op->layout= layout;
op->type->ui((bContext*)C, op);
@@ -2759,25 +2778,6 @@
RNA_pointer_create(&wm->id, op->type->srna, op->properties,
&ptr);
- /* menu */
- if(op->type->flag & OPTYPE_PRESET) {
- /* XXX, no simple way to get
WM_MT_operator_presets.bl_label from python! Label remains the same always! */
- PointerRNA op_ptr;
- uiLayout *row;
-
- row= uiLayoutRow(layout, TRUE);
- uiItemM(row, (bContext *)C, "WM_MT_operator_presets",
NULL, ICON_NONE);
-
- WM_operator_properties_create(&op_ptr,
"WM_OT_operator_preset_add");
- RNA_string_set(&op_ptr, "operator", op->type->idname);
- op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add",
"", ICON_ZOOMIN, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
-
- WM_operator_properties_create(&op_ptr,
"WM_OT_operator_preset_add");
- RNA_string_set(&op_ptr, "operator", op->type->idname);
- RNA_boolean_set(&op_ptr, "remove_active", 1);
- op_ptr= uiItemFullO(row, "WM_OT_operator_preset_add",
"", ICON_ZOOMOUT, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
- }
-
/* main draw call */
empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align)
== 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
