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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-03-07 01:42:03 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-03-07 01:42:03 +0400
commit7c59666a278d086b10f9e3dd0f13b5009ba30271 (patch)
tree6b6968967cc504f05820a1bc2beb726725c12f91 /source/blender/makesrna/intern/rna_armature.c
parent2fd7a56526a356a984e5c03354834bd7ada94014 (diff)
Mango request: for range buttons copy start+1 to end if start>=0
Also copy end-1 to start if changing end boundary and end<=start. Scene's start/end frames and ghost range in armature buttons are affected.
Diffstat (limited to 'source/blender/makesrna/intern/rna_armature.c')
-rw-r--r--source/blender/makesrna/intern/rna_armature.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index ba93f27e5a3..b6d07d079f1 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -234,15 +234,23 @@ static void rna_Armature_layer_set(PointerRNA *ptr, const int *values)
static void rna_Armature_ghost_start_frame_set(PointerRNA *ptr, int value)
{
bArmature *data = (bArmature*)ptr->data;
- CLAMP(value, 1, data->ghostef);
+ CLAMP(value, 1, (int)(MAXFRAMEF/2));
data->ghostsf = value;
+
+ if (data->ghostsf >= data->ghostef) {
+ data->ghostef = MIN2(data->ghostsf + 1, (int)(MAXFRAMEF/2));
+ }
}
static void rna_Armature_ghost_end_frame_set(PointerRNA *ptr, int value)
{
bArmature *data = (bArmature*)ptr->data;
- CLAMP(value, data->ghostsf, (int)(MAXFRAMEF/2));
+ CLAMP(value, 1, (int)(MAXFRAMEF/2));
data->ghostef = value;
+
+ if (data->ghostsf >= data->ghostef) {
+ data->ghostsf = MAX2(data->ghostef - 1, 1);
+ }
}
/* XXX depreceated... old armature only animviz */