diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-20 20:48:48 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-20 20:48:48 +0400 |
commit | 55015daa43f0ab45341e316abcf11f23c87b5ebe (patch) | |
tree | 3156892b6d807d9ba513d444adb870b0ae358e7a /release/scripts/templates/ui_panel.py | |
parent | 1fe70c07a008185c4e5925aff2c214c93ff396b7 (diff) | |
parent | a9e2e2279780ec2fb58e6820b9cad95ba03f4cad (diff) |
Merged changes in the trunk up to revision 51448.
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c
Diffstat (limited to 'release/scripts/templates/ui_panel.py')
-rw-r--r-- | release/scripts/templates/ui_panel.py | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/release/scripts/templates/ui_panel.py b/release/scripts/templates/ui_panel.py index 9ffa0cbeeea..cacdb83e815 100644 --- a/release/scripts/templates/ui_panel.py +++ b/release/scripts/templates/ui_panel.py @@ -22,7 +22,7 @@ class LayoutDemoPanel(bpy.types.Panel): row.prop(scene, "frame_end") # Create an row where the buttons are aligned to each other. - layout.label(text=" Aligned Row") + layout.label(text=" Aligned Row:") row = layout.row(align=True) row.prop(scene, "frame_start") @@ -39,9 +39,26 @@ class LayoutDemoPanel(bpy.types.Panel): # Second column, aligned col = split.column(align=True) - col.label(text="Column Two") + col.label(text="Column Two:") col.prop(scene, "frame_start") col.prop(scene, "frame_end") + + # Big render button + layout.label(text="Big Button:") + row = layout.row() + row.scale_y = 3.0 + row.operator("render.render") + + # Different sizes in a row + layout.label(text="Different button sizes:") + row = layout.row(align=True) + row.operator("render.render") + + sub = row.row() + sub.scale_x = 2.0 + sub.operator("render.render") + + row.operator("render.render") def register(): |