diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-02-04 12:09:31 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-02-04 12:09:31 +0300 |
commit | 00c9745720c354c8a0732bb223e044bbfb13958b (patch) | |
tree | 1f7cf910d90bf9b11b4cdcb655abb5d8578bc4b1 /source/blender/blenkernel/intern | |
parent | 9c84d2a4242915a1b3328d196d25828475328a5a (diff) |
2.5
* Outliner 'select' (i.e. blue/grey highlights for tree items) works again in both normal Outliner + RNA views.
* Fixed bugs/MSVC warnings in animation code
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index c05aad07fce..72fd0259b89 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -511,7 +511,7 @@ static float get_actionstrip_frame(bActionStrip *strip, float cframe, int invert repeat = (strip->flag & ACTSTRIP_USESTRIDE) ? (1.0f) : (strip->repeat); if (strip->scale == 0.0f) strip->scale= 1.0f; - scale = fabs(strip->scale); /* scale must be positive (for now) */ + scale = (float)fabs(strip->scale); /* scale must be positive (for now) */ actlength = strip->actend-strip->actstart; if (actlength == 0.0f) actlength = 1.0f; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 20bed37e4bc..46e072c4a61 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -936,7 +936,7 @@ static void icu_to_fcurves (ListBase *list, IpoCurve *icu, char *actname, char * fcurve= fcu; /* set path */ - fcurve->rna_path= adrcode_bitmap_path_copy(abp->path); + fcurve->rna_path= BLI_strdupn(abp->path, strlen(abp->path)); fcurve->array_index= abp->array_index; /* convert keyframes |