Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-06-11 15:53:41 +0400
committerJoshua Leung <aligorith@gmail.com>2009-06-11 15:53:41 +0400
commitcdeb95e737f6995b3b4cb2ced1a966f787167c1b (patch)
tree0f28a48771eb9ade4a1cf455c6a0923b0d789f62 /source/blender/makesrna/intern/rna_nla.c
parent0bef8012bc71b1a1d3fae4f5ef82055045ef4752 (diff)
NLA SoC: RNA Fixes
- Lower bound for start values has been expanded to -MAXFRAME, to avoid clipping problems when the strip is moved past frame 0 - Removed some obsolete (+ commented out) NLA wrapping in Object stuff
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
-rw-r--r--source/blender/makesrna/intern/rna_nla.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index b55b4e431fb..4b5c14aab82 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -47,13 +47,13 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value)
/* clamp value to lie within valid limits
* - cannot start past the end of the strip + some flexibility threshold
* - cannot start before the previous strip (if present) ends
- * - minimum frame is 1.0f (this can be changed)
+ * - minimum frame is -MAXFRAME so that we don't get clipping on frame 0
*/
if (data->prev) {
CLAMP(value, data->prev->end, data->end-0.1f);
}
else {
- CLAMP(value, 1, data->end);
+ CLAMP(value, -MAXFRAME, data->end);
}
data->start= value;
}
@@ -137,7 +137,7 @@ static void rna_NlaStrip_blend_out_set(PointerRNA *ptr, float value)
static void rna_NlaStrip_action_start_frame_set(PointerRNA *ptr, float value)
{
NlaStrip *data= (NlaStrip*)ptr->data;
- CLAMP(value, 1, data->actend);
+ CLAMP(value, -MAXFRAME, data->actend);
data->actstart= value;
}