diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h index dcac971a85b..35f539482b0 100644 --- a/source/blender/include/BIF_butspace.h +++ b/source/blender/include/BIF_butspace.h @@ -81,9 +81,6 @@ extern void redraw_test_buttons(struct Base *new); #define TAB_SHADING_WORLD 3 #define TAB_SHADING_LAMP 4 -#define TAB_OBJECT_OBJECT 0 -#define TAB_OBJECT_EFFECTS 1 - /* buts->scaflag */ #define BUTS_SENS_SEL 1 #define BUTS_SENS_ACT 2 diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index ef48bc21b17..8ac7420ac22 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -121,6 +121,7 @@ typedef struct View3D { #define V3D_TEXTUREPAINT 256 #define V3D_WEIGHTPAINT 512 #define V3D_ALIGN 1024 +#define V3D_SELECT_OUTLINE 2048 /* View3D->around */ #define V3D_CENTRE 0 diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index 89fda6654d4..8a3ef7bb29c 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -417,13 +417,8 @@ void drawbutspace(ScrArea *sa, void *spacedata) break; case CONTEXT_OBJECT: - tab= sbuts->tab[CONTEXT_OBJECT]; - if(tab== TAB_OBJECT_OBJECT) { - object_panels(); - } - else if(tab == TAB_OBJECT_EFFECTS) { - effects_panels(); - } + /* no tabs */ + object_panels(); break; case CONTEXT_SHADING: diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 0d2f142e26d..1d82fb7adbe 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -1084,24 +1084,6 @@ static void object_panel_anim(Object *ob) } -void object_panels() -{ - Object *ob; - - /* check context here */ - ob= OBACT; - if(ob) { - if(ob->id.lib) uiSetButLock(1, "Can't edit library data"); - - object_panel_anim(ob); - object_panel_draw(ob); - object_panel_constraint(); - /* if(ob->type==OB_MESH) object_panel_effects(ob); */ - - uiClearButLock(); - } -} - void do_effects_panels(unsigned short event) { Object *ob; @@ -1246,12 +1228,13 @@ void do_effects_panels(unsigned short event) } /* Panel for particle interaction settings */ -static void editing_panel_deflectors(Object *ob) +static void object_panel_deflectors(Object *ob) { uiBlock *block; - block= uiNewBlock(&curarea->uiblocks, "editing_panel_deflectors", UI_EMBOSS, UI_HELV, curarea->win); - if(uiNewPanel(curarea, block, "Particle Interaction", "Effects", 0, 0, 300, 204)==0) return; + block= uiNewBlock(&curarea->uiblocks, "object_panel_deflectors", UI_EMBOSS, UI_HELV, curarea->win); + uiNewPanelTabbed("Constraints", "Object"); + if(uiNewPanel(curarea, block, "Particle Interaction", "Object", 640, 0, 318, 204)==0) return; /* should become button, option? */ if(ob->pd==NULL) { @@ -1279,15 +1262,16 @@ static void editing_panel_deflectors(Object *ob) } } -void effects_panel_effects(Object *ob) +void object_panel_effects(Object *ob) { Effect *eff; uiBlock *block; int a; short x, y; - block= uiNewBlock(&curarea->uiblocks, "effect_panel_effects", UI_EMBOSS, UI_HELV, curarea->win); - if(uiNewPanel(curarea, block, "Effects", "Effects", 190, 0, 418, 204)==0) return; + block= uiNewBlock(&curarea->uiblocks, "object_panel_effects", UI_EMBOSS, UI_HELV, curarea->win); + uiNewPanelTabbed("Constraints", "Object"); + if(uiNewPanel(curarea, block, "Effects", "Object", 640, 0, 418, 204)==0) return; /* EFFECTS */ @@ -1422,8 +1406,7 @@ void effects_panel_effects(Object *ob) } } - -void effects_panels() +void object_panels() { Object *ob; @@ -1432,11 +1415,15 @@ void effects_panels() if(ob) { if(ob->id.lib) uiSetButLock(1, "Can't edit library data"); - editing_panel_deflectors(ob); + object_panel_anim(ob); + object_panel_draw(ob); + object_panel_constraint(); if(ob->type==OB_MESH) { - effects_panel_effects(ob); + object_panel_effects(ob); } - + object_panel_deflectors(ob); + uiClearButLock(); } } + diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 304618b16a8..d1619e8b215 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -3719,32 +3719,29 @@ void common_insertkey() } } else if(G.buts->mainb==CONTEXT_OBJECT) { - int tab= G.buts->tab[CONTEXT_OBJECT]; ob= OBACT; - if(tab==TAB_OBJECT_EFFECTS) { - if(ob && ob->type==OB_MESH) { - id= (ID *) (ob); - if(id) { - event= pupmenu("Insert Key %t|Surface Damping%x0|Random Damping%x1|Permeability%x2|Force Strength%x3|Force Falloff%x4"); - if(event== -1) return; - - if(event==0) { - insertkey(id, OB_PD_SDAMP); - } - if(event==1) { - insertkey(id, OB_PD_RDAMP); - } - if(event==2) { - insertkey(id, OB_PD_PERM); - } - if(event==3) { - insertkey(id, OB_PD_FSTR); - } - if(event==4) { - insertkey(id, OB_PD_FFALL); - } + if(ob && ob->type==OB_MESH) { + id= (ID *) (ob); + if(id) { + event= pupmenu("Insert Key %t|Surface Damping%x0|Random Damping%x1|Permeability%x2|Force Strength%x3|Force Falloff%x4"); + if(event== -1) return; + if(event==0) { + insertkey(id, OB_PD_SDAMP); } + if(event==1) { + insertkey(id, OB_PD_RDAMP); + } + if(event==2) { + insertkey(id, OB_PD_PERM); + } + if(event==3) { + insertkey(id, OB_PD_FSTR); + } + if(event==4) { + insertkey(id, OB_PD_FFALL); + } + } } else if(ob && ob->type==OB_CAMERA) { diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c index 5bddc5f25f2..47aa6f7bc4b 100644 --- a/source/blender/src/header_buttonswin.c +++ b/source/blender/src/header_buttonswin.c @@ -554,9 +554,6 @@ void buts_buttons(void) break; case CONTEXT_OBJECT: - uiBlockBeginAlign(block); - uiDefIconButC(block, ROW, B_REDR, ICON_OBJECT, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_OBJECT, 0, 0, "Object "); - uiDefIconButC(block, ROW, B_REDR, ICON_EFFECTS, xco+=XIC, t_base, XIC, YIC, &(G.buts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_EFFECTS, 0, 0, "Effects"); break; case CONTEXT_SHADING: