Revision: 23731
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23731
Author: blendix
Date: 2009-10-09 12:45:11 +0200 (Fri, 09 Oct 2009)
Log Message:
-----------
3D View panels now show object and bone name again, not sure it
belongs here still, but this came up often, it avoids having to
switch tabs a lot when creating things.
Also renamed uiLayoutFreeBlock to uiLayoutAbsoluteBlock.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_buttons.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-09
09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-09
10:45:11 UTC (rev 23731)
@@ -614,7 +614,7 @@
uiLayout *uiLayoutFree(uiLayout *layout, int align);
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage);
-uiBlock *uiLayoutFreeBlock(uiLayout *layout);
+uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout);
/* templates */
void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -96,7 +96,7 @@
ITEM_LAYOUT_COLUMN_FLOW,
ITEM_LAYOUT_ROW_FLOW,
ITEM_LAYOUT_BOX,
- ITEM_LAYOUT_FREE,
+ ITEM_LAYOUT_ABSOLUTE,
ITEM_LAYOUT_SPLIT,
ITEM_LAYOUT_ROOT
@@ -290,7 +290,7 @@
case ITEM_LAYOUT_COLUMN:
case ITEM_LAYOUT_COLUMN_FLOW:
case ITEM_LAYOUT_SPLIT:
- case ITEM_LAYOUT_FREE:
+ case ITEM_LAYOUT_ABSOLUTE:
case ITEM_LAYOUT_BOX:
default:
return UI_LAYOUT_VERTICAL;
@@ -1731,7 +1731,7 @@
}
/* free layout */
-static void ui_litem_estimate_free(uiLayout *litem)
+static void ui_litem_estimate_absolute(uiLayout *litem)
{
uiItem *item;
int itemx, itemy, itemw, itemh, minx, miny;
@@ -1756,7 +1756,7 @@
litem->h -= miny;
}
-static void ui_litem_layout_free(uiLayout *litem)
+static void ui_litem_layout_absolute(uiLayout *litem)
{
uiItem *item;
float scalex=1.0f, scaley=1.0f;
@@ -1962,7 +1962,7 @@
uiLayout *litem;
litem= MEM_callocN(sizeof(uiLayout), "uiLayoutFree");
- litem->item.type= ITEM_LAYOUT_FREE;
+ litem->item.type= ITEM_LAYOUT_ABSOLUTE;
litem->root= layout->root;
litem->align= align;
litem->active= 1;
@@ -1975,7 +1975,7 @@
return litem;
}
-uiBlock *uiLayoutFreeBlock(uiLayout *layout)
+uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout)
{
uiBlock *block;
@@ -2136,8 +2136,8 @@
case ITEM_LAYOUT_ROOT:
ui_litem_estimate_root(litem);
break;
- case ITEM_LAYOUT_FREE:
- ui_litem_estimate_free(litem);
+ case ITEM_LAYOUT_ABSOLUTE:
+ ui_litem_estimate_absolute(litem);
break;
case ITEM_LAYOUT_SPLIT:
ui_litem_estimate_split(litem);
@@ -2161,7 +2161,7 @@
if(!bitem->but->alignnr)
bitem->but->alignnr= nr;
}
- else if(item->type == ITEM_LAYOUT_FREE);
+ else if(item->type == ITEM_LAYOUT_ABSOLUTE);
else if(item->type == ITEM_LAYOUT_BOX) {
box= (uiLayoutItemBx*)item;
box->roundbox->alignnr= nr;
@@ -2221,8 +2221,8 @@
case ITEM_LAYOUT_ROOT:
ui_litem_layout_root(litem);
break;
- case ITEM_LAYOUT_FREE:
- ui_litem_layout_free(litem);
+ case ITEM_LAYOUT_ABSOLUTE:
+ ui_litem_layout_absolute(litem);
break;
case ITEM_LAYOUT_SPLIT:
ui_litem_layout_split(litem);
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -61,7 +61,7 @@
{
uiBlock *block;
- block= uiLayoutFreeBlock(layout);
+ block= uiLayoutAbsoluteBlock(layout);
if(menus) ED_area_header_standardbuttons(C, block, 0);
else ED_area_header_switchbutton(C, block, 0);
}
@@ -603,7 +603,7 @@
}
result= uiLayoutColumn(box, 0);
- block= uiLayoutFreeBlock(box);
+ block= uiLayoutAbsoluteBlock(box);
}
if(md->error) {
@@ -948,7 +948,7 @@
}
else {
box= uiLayoutBox(col);
- block= uiLayoutFreeBlock(box);
+ block= uiLayoutAbsoluteBlock(box);
switch (con->type) {
#ifndef DISABLE_PYTHON
@@ -1459,7 +1459,7 @@
rect.xmin= 0; rect.xmax= 200;
rect.ymin= 0; rect.ymax= 190;
- block= uiLayoutFreeBlock(layout);
+ block= uiLayoutAbsoluteBlock(layout);
colorband_buttons_layout(block, cptr.data, &rect, !expand, cb);
MEM_freeN(cb);
Modified: trunk/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -146,7 +146,7 @@
if(!graph_panel_context(C, &ale, &fcu))
return;
- block= uiLayoutFreeBlock(pa->layout);
+ block= uiLayoutAbsoluteBlock(pa->layout);
uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL);
/* Info - Active F-Curve */
@@ -285,7 +285,7 @@
driver= fcu->driver;
- block= uiLayoutFreeBlock(pa->layout);
+ block= uiLayoutAbsoluteBlock(pa->layout);
uiBlockSetHandleFunc(block, do_graph_region_driver_buttons, NULL);
/* general actions */
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -1105,7 +1105,7 @@
ARegion *ar= CTX_wm_region(C);
uiBlock *block;
- block= uiLayoutFreeBlock(pa->layout);
+ block= uiLayoutAbsoluteBlock(pa->layout);
uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
image_editvertex_buts(C, block);
Modified: trunk/blender/source/blender/editors/space_logic/logic_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_buttons.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/space_logic/logic_buttons.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -83,7 +83,7 @@
// SpaceLogic *slogic= CTX_wm_space_logic(C);
uiBlock *block;
- block= uiLayoutFreeBlock(pa->layout);
+ block= uiLayoutAbsoluteBlock(pa->layout);
uiBlockSetHandleFunc(block, do_logic_panel_events, NULL);
}
@@ -93,7 +93,7 @@
// SpaceLogic *slogic= CTX_wm_space_logic(C);
uiBlock *block;
- block= uiLayoutFreeBlock(pa->layout);
+ block= uiLayoutAbsoluteBlock(pa->layout);
uiBlockSetHandleFunc(block, do_logic_panel_events, NULL);
}
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2009-10-09
09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2009-10-09
10:45:11 UTC (rev 23731)
@@ -173,7 +173,7 @@
static void node_buts_group(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
@@ -207,7 +207,7 @@
static void node_buts_value(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
bNodeSocket *sock= node->outputs.first; /* first socket stores
value */
@@ -219,7 +219,7 @@
static void node_buts_rgb(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
bNodeSocket *sock= node->outputs.first; /* first socket stores
value */
@@ -279,7 +279,7 @@
static void node_buts_valtorgb(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
@@ -316,7 +316,7 @@
static void node_buts_normal(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
bNodeSocket *sock= node->outputs.first; /* first socket stores
normal */
@@ -389,7 +389,7 @@
static void node_buts_texture(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
bNodeTree *ntree= ptr->id.data;
rctf *butr= &node->butr;
@@ -432,7 +432,7 @@
static void node_buts_math(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
uiBut *bt;
@@ -544,7 +544,7 @@
static void node_shader_buts_material(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
bNodeTree *ntree= ptr->id.data;
rctf *butr= &node->butr;
@@ -616,7 +616,7 @@
static void node_shader_buts_mapping(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
TexMapping *texmap= node->storage;
@@ -664,7 +664,7 @@
static void node_shader_buts_vect_math(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
uiBut *bt;
@@ -675,7 +675,7 @@
static void node_shader_buts_geometry(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
rctf *butr= &node->butr;
uiBut *but;
@@ -694,7 +694,7 @@
static void node_shader_buts_dynamic(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
bNodeTree *ntree= ptr->id.data;
rctf *butr= &node->butr;
@@ -867,7 +867,7 @@
static void node_composit_buts_image(uiLayout *layout, PointerRNA *ptr)
{
- uiBlock *block= uiLayoutFreeBlock(layout);
+ uiBlock *block= uiLayoutAbsoluteBlock(layout);
bNode *node= ptr->data;
bNodeTree *ntree= ptr->id.data;
rctf *butr= &node->butr;
@@ -1035,7 +1035,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
