[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44327] trunk/blender/source/blender/ editors/space_node/drawnode.c: Multi File Output Node:
Thomas Dinges
blender at dingto.org
Wed Feb 22 15:19:51 CET 2012
Revision: 44327
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44327
Author: dingto
Date: 2012-02-22 14:19:39 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Multi File Output Node:
* Some small UI tweaks, grey out image settings rather than hide and made it a bit more compact.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-02-22 13:15:29 UTC (rev 44326)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-02-22 14:19:39 UTC (rev 44327)
@@ -1731,10 +1731,9 @@
uiTemplateList(layout, C, ptr, "inputs", ptr, "active_input_index", NULL, 0, 0, 0);
if (active_input_ptr.data) {
+ PointerRNA imfptr = RNA_pointer_get(&active_input_ptr, "format");
uiLayout *row, *col;
- uiItemS(layout);
-
col = uiLayoutColumn(layout, 1);
uiItemL(col, "File Path:", 0);
row = uiLayoutRow(col, 0);
@@ -1742,12 +1741,14 @@
uiItemFullO(row, "NODE_OT_output_multi_file_remove_active_socket", "", ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY);
uiItemS(layout);
- uiItemL(layout, "Format:", 0);
- uiItemR(layout, &active_input_ptr, "use_render_format", 0, NULL, 0);
- if (!RNA_boolean_get(&active_input_ptr, "use_render_format")) {
- PointerRNA imfptr = RNA_pointer_get(&active_input_ptr, "format");
- uiTemplateImageSettings(layout, &imfptr);
- }
+
+ col = uiLayoutColumn(layout, 1);
+ uiItemL(col, "Format:", 0);
+ uiItemR(col, &active_input_ptr, "use_render_format", 0, NULL, 0);
+
+ col= uiLayoutColumn(layout, 0);
+ uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_render_format")==0);
+ uiTemplateImageSettings(col, &imfptr);
}
}
More information about the Bf-blender-cvs
mailing list