[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61108] trunk/blender/source/blender/ makesrna/intern/rna_fcurve.c: Remove soft limits from lower-end of ranges for last two commits - This turned

[Joshua Leung]

Revision: 61108
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61108
Author:   aligorith
Date:     2013-11-05 01:20:30 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Remove soft limits from lower-end of ranges for last two commits - This turned
out to be too restrictive/confusing again.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2013-11-05 01:04:23 UTC (rev 61107)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2013-11-05 01:20:30 UTC (rev 61108)
@@ -463,7 +463,7 @@
 {
 	FModifier *fcm = (FModifier *)ptr->data;
 	
-	CLAMP(value, MINAFRAME, MAXFRAME);
+	CLAMP(value, MINAFRAMEF, MAXFRAMEF);
 	fcm->sfra = value;
 	
 	/* XXX: maintain old offset? */
@@ -476,7 +476,7 @@
 {
 	FModifier *fcm = (FModifier *)ptr->data;
 	
-	CLAMP(value, MINAFRAME, MAXFRAME);
+	CLAMP(value, MINAFRAMEF, MAXFRAMEF);
 	fcm->efra = value;
 	
 	/* XXX: maintain old offset? */
@@ -492,11 +492,11 @@
 	
 	/* Technically, "sfra <= efra" must hold; however, we can't strictly enforce that, 
 	 * or else it becomes tricky to adjust the range...  [#36844] 
+	 * 
+	 * NOTE: we do not set soft-limits on lower bounds, as it's too confusing when you 
+	 *       can't easily use the slider to set things here
 	 */
 	*min     = MINAFRAMEF;
-	*softmin = MINAFRAMEF;
-	
-	*softmax = (fcm->flag & FMODIFIER_FLAG_RANGERESTRICT) ? fcm->efra : MAXFRAMEF;
 	*max     = MAXFRAMEF;
 }
 
@@ -615,15 +615,13 @@
 }
 
 static void rna_FModifierLimits_minx_range(PointerRNA *ptr, float *min, float *max,
-                                           float *softmin, float *softmax)
+                                           float *UNUSED(softmin), float *UNUSED(softmax))
 {
 	FModifier *fcm = (FModifier *)ptr->data;
 	FMod_Limits *data = fcm->data;
 	
+	/* no soft-limits on lower bound - it's too confusing when you can't easily use the slider to set things here */
 	*min     = MINAFRAMEF;
-	*softmin = MINAFRAMEF;
-	
-	*softmax = (data->flag & FCM_LIMIT_XMAX) ? data->rect.xmax : MAXFRAMEF;
 	*max     = MAXFRAMEF;
 }
 
@@ -646,10 +644,8 @@
 	FModifier *fcm = (FModifier *)ptr->data;
 	FMod_Limits *data = fcm->data;
 	
+	/* no soft-limits on lower bound - it's too confusing when you can't easily use the slider to set things here */
 	*min     = -FLT_MAX;
-	*softmin = -FLT_MAX;
-	
-	*softmax = (data->flag & FCM_LIMIT_YMAX) ? data->rect.ymax : FLT_MAX;
 	*max     = FLT_MAX;
 }