diff options
author | Thomas Dinges <blender@dingto.org> | 2009-06-07 19:40:14 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-06-07 19:40:14 +0400 |
commit | 51740b57b985de11015f4a9cda9dbe9ae108f2c7 (patch) | |
tree | e60ccc73b10e7bd91a5dca3853a86d0a6ec9bc01 | |
parent | bb06e311a18518740edec42dce26d377ab16f0d7 (diff) |
2.5 Buttons:
* Small stamp tweaks by William Reynish.
* Moved the modifier tab next to constraints.
-rw-r--r-- | release/ui/buttons_scene.py | 10 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_header.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index d7f215f2297..f4e2cebfa4b 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -209,13 +209,15 @@ class RENDER_PT_stamp(RenderButtonsPanel): sub = split.column() sub.itemR(rd, "render_stamp") - sub.itemR(rd, "stamp_foreground") - sub.itemR(rd, "stamp_background") - sub.itemR(rd, "stamp_font_size", text="Font Size") + colsub = sub.column() + colsub.active = rd.render_stamp + colsub.itemR(rd, "stamp_foreground") + colsub.itemR(rd, "stamp_background") + colsub.itemR(rd, "stamp_font_size", text="Font Size") bpy.types.register(RENDER_PT_render) bpy.types.register(RENDER_PT_dimensions) bpy.types.register(RENDER_PT_antialiasing) bpy.types.register(RENDER_PT_shading) bpy.types.register(RENDER_PT_output) -bpy.types.register(RENDER_PT_stamp) +bpy.types.register(RENDER_PT_stamp)
\ No newline at end of file diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 73f161e1130..ee710cd7b67 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -174,10 +174,10 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object"); if(sbuts->pathflag & (1<<BCONTEXT_CONSTRAINT)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, "Modifier"); - if(sbuts->pathflag & (1<<BCONTEXT_DATA)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, sbuts->dataicon, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, "Object Data"); if(sbuts->pathflag & (1<<BCONTEXT_MODIFIER)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, "Modifier"); + if(sbuts->pathflag & (1<<BCONTEXT_DATA)) + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, sbuts->dataicon, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, "Object Data"); if(sbuts->pathflag & (1<<BCONTEXT_BONE)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, "Bone"); if(sbuts->pathflag & (1<<BCONTEXT_MATERIAL)) |