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/src/editipo_lib.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/src/editipo_lib.c')
| -rw-r--r-- | source/blender/src/editipo_lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c index 4c6bb24a3da..f32e1816b2d 100644 --- a/source/blender/src/editipo_lib.c +++ b/source/blender/src/editipo_lib.c @@ -88,7 +88,7 @@ char *wo_ic_names[WO_TOTNAM] = { "HorR", "HorG", "HorB", "ZenR", "ZenG", "ZenB", char *la_ic_names[LA_TOTNAM] = { "Energ", "R", "G", "B", "Dist", "SpoSi", "SpoBl", "Quad1", "Quad2", "HaInt" }; /* yafray: two curve names added, 'Apert' for aperture, and 'FDist' for focal distance */ -char *cam_ic_names[CAM_TOTNAM] = { "Lens", "ClSta", "ClEnd", "Apert", "FDist" }; +char *cam_ic_names[CAM_TOTNAM] = { "Lens", "ClSta", "ClEnd", "Apert", "FDist", "ShiftX", "ShiftY" }; char *snd_ic_names[SND_TOTNAM] = { "Vol", "Pitch", "Pan", "Atten" }; char *ac_ic_names[AC_TOTNAM] = {"LocX", "LocY", "LocZ", "ScaleX", "ScaleY", "ScaleZ", "QuatW", "QuatX", "QuatY", "QuatZ"}; @@ -187,9 +187,7 @@ char *getname_la_ei(int nr) char *getname_cam_ei(int nr) { - /* yafray: curves extended to CAM_YF_FDIST */ - //if(nr>=CAM_LENS && nr<=CAM_END) return cam_ic_names[nr-1]; - if(nr>=CAM_LENS && nr<=CAM_YF_FDIST) return cam_ic_names[nr-1]; + if(nr>=CAM_LENS && nr<=CAM_SHIFT_Y) return cam_ic_names[nr-1]; return ic_name_empty[0]; } |