[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20265] branches/blender2.5/blender: 2. 5 UI:
Thomas Dinges
dingto at gmx.de
Mon May 18 20:20:29 CEST 2009
Revision: 20265
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20265
Author: dingto
Date: 2009-05-18 20:20:29 +0200 (Mon, 18 May 2009)
Log Message:
-----------
2.5 UI:
* Added new Buttons Tab "Bone" for Armature objects.
* Validation of buttons selection, when object selection is changed.
* added missing notifier for camera type and small layout change to the panel.
* more shading color changes for menu and checkbox.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_camera.py
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_camera.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_camera.py 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/release/ui/buttons_data_camera.py 2009-05-18 18:20:29 UTC (rev 20265)
@@ -68,11 +68,11 @@
sub.itemR(cam, "show_mist", text="Mist")
sub.itemR(cam, "show_title_safe", text="Title Safe")
sub.itemR(cam, "show_name", text="Name")
+
+ sub = split.column()
sub.itemR(cam, "show_passepartout", text="Passepartout")
if (cam.show_passepartout):
sub.itemR(cam, "passepartout_alpha", text="Alpha")
-
- sub = split.column()
sub.itemR(cam, "draw_size", text="Size")
bpy.types.register(DATA_PT_cameralens)
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c 2009-05-18 18:20:29 UTC (rev 20265)
@@ -956,7 +956,7 @@
{255, 255, 255, 255},
1,
- 25, -20
+ 15, -15
};
/* button that shows popup */
@@ -970,7 +970,7 @@
{204, 204, 204, 255},
1,
- 25, -20
+ 15, -15
};
/* button that starts pulldown */
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2009-05-18 18:20:29 UTC (rev 20265)
@@ -172,6 +172,19 @@
uiBlockSetEmboss(block, UI_EMBOSS);
+ // if object selection changed, validate button selection
+ if(ob && (ob->type == OB_LAMP) && ELEM3(sbuts->mainb, (float)BCONTEXT_MATERIAL, (float)BCONTEXT_PARTICLE, (float)BCONTEXT_PHYSICS))
+ sbuts->mainb = (float)BCONTEXT_DATA;
+
+ if(ob && (ob->type == OB_EMPTY) && ELEM3(sbuts->mainb, (float)BCONTEXT_MATERIAL, (float)BCONTEXT_TEXTURE, (float)BCONTEXT_PARTICLE))
+ sbuts->mainb = (float)BCONTEXT_DATA;
+
+ if((ob && ELEM(ob->type, OB_CAMERA, OB_ARMATURE)) && ELEM4(sbuts->mainb, (float)BCONTEXT_MATERIAL, (float)BCONTEXT_TEXTURE, (float)BCONTEXT_PARTICLE, (float)BCONTEXT_PHYSICS))
+ sbuts->mainb = (float)BCONTEXT_DATA;
+
+ if((ob && (ob->type != OB_ARMATURE)) && (sbuts->mainb == (float)BCONTEXT_BONE))
+ sbuts->mainb = (float)BCONTEXT_DATA;
+
uiBlockBeginAlign(block);
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene");
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World");
@@ -185,8 +198,11 @@
uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PARTICLES, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, "Particles");
if(ob && ELEM6(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT, OB_EMPTY))
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PHYSICS, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, "Physics");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PHYSICS, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, "Physics");
+ if(ob && (ob->type == OB_ARMATURE))
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, "Bone");
+
xco+= XIC;
uiBlockEndAlign(block);
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h 2009-05-18 18:20:29 UTC (rev 20265)
@@ -43,6 +43,7 @@
#define BCONTEXT_PARTICLE 6
#define BCONTEXT_PHYSICS 7
#define BCONTEXT_GAME 8
+#define BCONTEXT_BONE 9
/* buts->scaflag */
#define BUTS_SENS_SEL 1
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c 2009-05-18 18:20:29 UTC (rev 20265)
@@ -185,6 +185,8 @@
ED_region_panels(C, ar, vertical, "particle");
else if(sbuts->mainb == BCONTEXT_PHYSICS)
ED_region_panels(C, ar, vertical, "physics");
+ else if(sbuts->mainb == BCONTEXT_BONE)
+ ED_region_panels(C, ar, vertical, "bone");
sbuts->re_align= 0;
sbuts->mainbo= sbuts->mainb;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c 2009-05-18 16:42:34 UTC (rev 20264)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c 2009-05-18 18:20:29 UTC (rev 20265)
@@ -57,7 +57,8 @@
prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_type_items);
RNA_def_property_ui_text(prop, "Type", "Camera types.");
-
+ RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
+
/* Number values */
prop= RNA_def_property(srna, "passepartout_alpha", PROP_FLOAT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list