diff options
author | Ton Roosendaal <ton@blender.org> | 2005-05-09 00:10:59 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-05-09 00:10:59 +0400 |
commit | ef2855bcab4dce77d95f54de8eede8423b61f54b (patch) | |
tree | 2805d75480f161fcb7a9db5422b045a8b3e521d1 /source/blender/src/drawtime.c | |
parent | eec4e3271442808f47bc8f4226b82692ffbcc541 (diff) |
Timline goodies;
- Mkey while ALT+A inserts markers.
Note for Matt; You forgot to check for 'val'. The delay in tuho I brought
back to max 1 frame. Delays are common in realtime gfx apps, the picture
you see is old, and its possible you press a key while next frame is
already drawing, and then it has to increase the frame value still... :)
- RMB escapes from anim playback
- on activate object, Timeline redraws too
- Added keyline drawing for Material Ipos. The CTRL+Page keys work with it.
Softbody:
- Renamed buttons to call "Spring constant" now "Stiff(ness)" and the
"Friction" became "Damping".
Diffstat (limited to 'source/blender/src/drawtime.c')
-rw-r--r-- | source/blender/src/drawtime.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/source/blender/src/drawtime.c b/source/blender/src/drawtime.c index a77df6243a4..a624f46b5c8 100644 --- a/source/blender/src/drawtime.c +++ b/source/blender/src/drawtime.c @@ -43,12 +43,14 @@ #include "DNA_action_types.h" #include "DNA_ipo_types.h" #include "DNA_object_types.h" +#include "DNA_material_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" #include "BKE_ipo.h" #include "BKE_object.h" +#include "BKE_material.h" #include "BKE_utildefines.h" #include "BKE_global.h" @@ -200,7 +202,8 @@ static void draw_ob_keys() Object *ob; bActionChannel *achan; bAction *act; - int ipoflag; + ListBase elems; + int a; char col[3]; if (OBACT) { @@ -210,27 +213,14 @@ static void draw_ob_keys() if(ob!=G.obedit) { if(ob->ipo) { /* convert the ipo to a list of 'current frame elements' */ - ListBase elems; elems.first= elems.last= NULL; make_cfra_list(ob->ipo, &elems); - /* disable time offset for the purposes of drawing the frame ticks */ - ipoflag= ob->ipoflag; - ob->ipoflag &= ~OB_OFFS_OB; - - set_no_parent_ipo(1); - disable_speed_curve(1); - /* draw the list of current frame elements */ col[0] = 0xDD; col[1] = 0xD7; col[2] = 0x00; draw_key_list(elems, col); - set_no_parent_ipo(0); - disable_speed_curve(0); - - ob->ipoflag= ipoflag; - BLI_freelistN(&elems); } @@ -240,7 +230,6 @@ static void draw_ob_keys() /* go through each channel in the action */ for (achan=act->chanbase.first; achan; achan=achan->next){ /* convert the ipo to a list of 'current frame elements' */ - ListBase elems; elems.first= elems.last= NULL; make_cfra_list(achan->ipo, &elems); @@ -251,6 +240,21 @@ static void draw_ob_keys() BLI_freelistN(&elems); } } + + for(a=0; a<ob->totcol; a++) { + Material *ma= give_current_material(ob, a+1); + + if(ma && ma->ipo) { + elems.first= elems.last= NULL; + make_cfra_list(ma->ipo, &elems); + + col[0] = 0xDD; col[1] = 0xA7; col[2] = 0x00; + draw_key_list(elems, col); + + BLI_freelistN(&elems); + } + } + } } } |