From 846da79887d1277eab06ef5ce0189e9f5827d978 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 28 Jul 2004 15:07:35 +0000 Subject: 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. --- source/blender/src/editipo.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'source/blender/src/editipo.c') 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) { -- cgit v1.2.3