diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-07-28 19:07:35 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-07-28 19:07:35 +0400 |
| commit | 846da79887d1277eab06ef5ce0189e9f5827d978 (patch) | |
| tree | 156431b5e655ea46375b76e146aedec7e5300a41 /source/blender/src/header_buttonswin.c | |
| parent | 76616c266e4df87ccce9cbede3730e5e417b3dd1 (diff) | |
Oops, include file belonging to previous commit...
Plus: moved particle interaction and effect buttons back to a single
Object context. The proposed solution (sub context) has workflow issues,
(adds another click (no hotkey) to view settings)
whilst almost all Object buttons nicely fit in single view still.
This was on todo since first particle commit, actually the idea was to
move particle related issues to a special sub-context, but leave the
effects themselves in the Object main menu. Splitting off Particles from
the Effect system isn't in the scope of what is feasible now.
Also note; the current panel 'particle interaction' actually should be
a generic 'forces and collision' panel, since it's also relevant for
soft body feature (WIP)... that can be changed later.
Diffstat (limited to 'source/blender/src/header_buttonswin.c')
| -rw-r--r-- | source/blender/src/header_buttonswin.c | 3 |
1 files changed, 0 insertions, 3 deletions
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: |