2.5 Buttons:
authorThomas Dinges <blender@dingto.org>
Sun, 7 Jun 2009 15:40:14 +0000 (15:40 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 7 Jun 2009 15:40:14 +0000 (15:40 +0000)
* Small stamp tweaks by William Reynish.

* Moved the modifier tab next to constraints.

release/ui/buttons_scene.py
source/blender/editors/space_buttons/buttons_header.c

index d7f215f2297e4847ed92bb92d8c8d28ddcd59a65..f4e2cebfa4bea4812e380164f4cb1b70eb0df1fb 100644 (file)
@@ -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
index 73f161e1130c74ad43c0e1e957db213489413072..ee710cd7b6715ea5122231a6a38dd326e17caf49 100644 (file)
@@ -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))