diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-05-05 14:07:05 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-05-05 14:07:05 +0400 |
commit | 49d680b2f316dd60dd9fb991ed6640b04678e943 (patch) | |
tree | 7df08685fb30b0399f84a0b8f4ff5d0a361070bc /source/blender | |
parent | b711bf185b00fd0a167ba7d1882cc320e203e571 (diff) |
== IPO Editor ==
Ctrl-Click to add a keyframe in the active ipo-curve only made sense when showkeys
was off. Otherwise the drawmode would change from keys to curves then back to keys when some other tool was used.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/src/drawnla.c | 11 | ||||
-rw-r--r-- | source/blender/src/space.c | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index ca73119c102..de35a0f2906 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -650,6 +650,17 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES uiDefButS(block, MENU, B_REDR, "All%x0|XY%x3|XZ%x2|YZ%x1", 140,-20,40,19, &amod->no_rot_axis, 0, 0, 0, 0, "Enable rotation axes (local for curve)"); uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_NLA_MOD_DEPS, "Ob:", 180,-20, 130, 19, &amod->ob, "Curve Object"); } +#if 0 /* this is not really ready for the primetime yet, but is here for testing */ + else if(amod->type==ACTSTRIP_MOD_NOISE) { + but= uiDefBut(block, TEX, B_NLA_PANEL, "Chan:", 10, -20, 130, 19, amod->channel, 1, 31, 0, 0, "Name of channel used for modifier"); + uiButSetCompleteFunc(but, autocomplete_bone, (void *)ob); + uiDefButBitS(block, TOG, 1, B_NLA_PANEL, "L", 140, -20, 20, 19, &amod->channels, 0, 24, 0, 0, "Apply noise to Location of channel"); + uiDefButBitS(block, TOG, 2, B_NLA_PANEL, "R", 160, -20, 20, 19, &amod->channels, 0, 24, 0, 0, "Apply noise to Rotation of channel"); + uiDefButBitS(block, TOG, 4, B_NLA_PANEL, "S", 180, -20, 20, 19, &amod->channels, 0, 24, 0, 0, "Apply noise to Scaling of channel"); + uiDefButF(block, NUM, B_NLA_PANEL, "NSize:", 200,-20,55,19, &amod->noisesize, 0.0001, 2.0, 10, 0, "Sets scaling for noise input"); + uiDefButF(block, NUM, B_NLA_PANEL, "Turb:", 255,-20,55,19, &amod->turbul, 0.0, 200.0, 10, 0, "Sets the depth of the noise"); + } +#endif else uiDefBut(block, LABEL, B_NOP, "Ack! Not implemented.", 10, -20, 150, 19, NULL, 0, 0, 0, 0, ""); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 75d2bc8f2e2..c33be774617 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2641,7 +2641,7 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt) doredraw= 1; } else if(view2dmove(LEFTMOUSE)); /* only checks for sliders */ - else if(G.qual & LR_CTRLKEY) add_vert_ipo(); + else if((G.qual & LR_CTRLKEY) && (sipo->showkey==0)) add_vert_ipo(); else { do { getmouseco_areawin(mval); @@ -2837,6 +2837,9 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt) remove_marker(); del_ipo(0); + /* note: don't update the other spaces (in particular ipo) + * or else curves disappear. + */ allqueue(REDRAWTIME, 0); allqueue(REDRAWSOUND, 0); } |