diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-01-15 15:44:45 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-01-15 15:44:45 +0300 |
| commit | c01aaac311c380aae3c7ee7d7a4f950a71cd95bc (patch) | |
| tree | 51968176d88c9801d747ade8d69966b25272e57b /source/blender/blenkernel/intern/ipo.c | |
| parent | a8a339b26e53891c4f597097cc2a2625ba5af890 (diff) | |
Two in one:
- Bugfix #5714
New option "Save changed images" didn't respect relative file names
- Bugfix #5621
New camera (shiftx, shifty) was missing in IpoWindow as animatable option
Diffstat (limited to 'source/blender/blenkernel/intern/ipo.c')
| -rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index ec3f38d67f7..b84410b12e7 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -166,7 +166,7 @@ int la_ar[LA_TOTIPO]= { /* yafray: aperture & focal distance curves added */ /* qdn: FDIST now available to Blender as well for defocus node */ int cam_ar[CAM_TOTIPO]= { - CAM_LENS, CAM_STA, CAM_END, CAM_YF_APERT, CAM_YF_FDIST + CAM_LENS, CAM_STA, CAM_END, CAM_YF_APERT, CAM_YF_FDIST, CAM_SHIFT_X, CAM_SHIFT_Y }; int snd_ar[SND_TOTIPO]= { @@ -1476,6 +1476,10 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type) poin= &(ca->YF_aperture); break; case CAM_YF_FDIST: poin= &(ca->YF_dofdist); break; + case CAM_SHIFT_X: + poin= &(ca->shiftx); break; + case CAM_SHIFT_Y: + poin= &(ca->shifty); break; } } else if(GS(id->name)==ID_SO) { @@ -1757,6 +1761,13 @@ void set_icu_vars(IpoCurve *icu) case CAM_YF_FDIST: icu->ymin = 0.0; icu->ymax = 5000.0; + break; + + case CAM_SHIFT_X: + case CAM_SHIFT_Y: + icu->ymin= -2.0f; + icu->ymax= 2.0f; + break; } } else if(icu->blocktype==ID_SO) { |