NLA SoC: Merge from 2.5 20215:20439 (HEAD)

2 files changed, 11 insertions, 5 deletions

diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index 14780ebb794..c2a1199f6c6 100644
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -242,14 +242,17 @@ void ipo_rainbow (int cur, int tot, float *out)
 	 * with some other stuff 
 	 */
 	fac = ((float)cur / (float)tot) * 0.7f;
-	val = 1.0f - fac;
 	
 	/* the base color can get offset a bit so that the colors aren't so identical */
 	hue += fac * HSV_BANDWIDTH; 
 	if (hue > 1.0f) hue= fmod(hue, 1.0f);
 	
-	/* saturation fluctuates between 0.5 and 1.0 */
-	sat = ((cur / grouping) % 2) ? 0.61f : 0.96f;
+	/* saturation adjustments for more visible range */
+	if ((hue > 0.5f) && (hue < 0.8f)) sat= 0.5f;
+	else sat= 0.6f;
+	
+	/* value is fixed at 1.0f, otherwise we cannot clearly see the curves... */
+	val= 1.0f;
 	
 	/* finally, conver this to RGB colors */
 	hsv_to_rgb(hue, sat, val, out, out+1, out+2); 
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 6d0c15ab724..9a40fb44f47 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1226,8 +1226,11 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 			
 			MEM_freeN(path);
 		}
-		else if (G.f & G_DEBUG)
-			printf("Button Insert-Key: no path to property \n");
+		else {
+			if (G.f & G_DEBUG)
+				printf("Button Insert-Key: no path to property \n");
+			BKE_report(op->reports, RPT_WARNING, "Failed to resolve path to property. Try using a Keying Set instead.");
+		}
 	}
 	else if (G.f & G_DEBUG) {
 		printf("ptr.data = %p, prop = %p,", ptr.data, prop);