Bugfixes:

- Fix for crash with Keying Sets when a Keying Set path has no ID-
block to target
- Info window now indicates the types of the reports shown by
colouring their entries if the entries are not selected.

1 files changed, 24 insertions, 14 deletions

diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index 71424bb8384..e41e8ad4064 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -62,14 +62,6 @@
 
 static void info_report_color(unsigned char *fg, unsigned char *bg, Report *report, int bool)
 {
-	/*
-	if		(type & RPT_ERROR_ALL)		{ fg[0]=220; fg[1]=0; fg[2]=0; }
-	else if	(type & RPT_WARNING_ALL)	{ fg[0]=220; fg[1]=96; fg[2]=96; }
-	else if	(type & RPT_OPERATOR_ALL)	{ fg[0]=96; fg[1]=128; fg[2]=255; }
-	else if	(type & RPT_INFO_ALL)		{ fg[0]=0; fg[1]=170; fg[2]=0; }
-	else if	(type & RPT_DEBUG_ALL)		{ fg[0]=196; fg[1]=196; fg[2]=196; }
-	else								{ fg[0]=196; fg[1]=196; fg[2]=196; }
-	*/
 	if(report->flag & SELECT) {
 		fg[0]=255; fg[1]=255; fg[2]=255;
 		if(bool) {
@@ -79,17 +71,35 @@ static void info_report_color(unsigned char *fg, unsigned char *bg, Report *repo
 			bg[0]=90; bg[1]=122; bg[2]=249;
 		}
 	}
-
 	else {
 		fg[0]=0; fg[1]=0; fg[2]=0;
-
-		if(bool) {
-			bg[0]=120; bg[1]=120; bg[2]=120;
+		
+		if (report->type & RPT_ERROR_ALL) {
+			if (bool) { bg[0]=220; bg[1]=0;   bg[2]=0;   }
+			else      { bg[0]=214; bg[1]=0;   bg[2]=0;   }
+		}
+		else if (report->type & RPT_WARNING_ALL) {
+			if (bool) { bg[0]=220; bg[1]=128; bg[2]=96;  }
+			else      { bg[0]=214; bg[1]=122; bg[2]=90;  }
+		}
+#if 0 // XXX: this looks like the selected colour, so don't use this
+		else if (report->type & RPT_OPERATOR_ALL) {
+			if (bool) { bg[0]=96;  bg[1]=128; bg[2]=255; }
+			else      { bg[0]=90;  bg[1]=122; bg[2]=249; }
+		}
+#endif
+		else if (report->type & RPT_INFO_ALL) {
+			if (bool) { bg[0]=0;   bg[1]=170; bg[2]=0;   }
+			else      { bg[0]=0;   bg[1]=164; bg[2]=0;   }
+		}
+		else if (report->type & RPT_DEBUG_ALL) {
+			if (bool) { bg[0]=196; bg[1]=196; bg[2]=196; }
+			else      { bg[0]=190; bg[1]=190; bg[2]=190; }
 		}
 		else {
-			bg[0]=114; bg[1]=114; bg[2]=114;
+			if (bool) { bg[0]=120; bg[1]=120; bg[2]=120; }
+			else      { bg[0]=114; bg[1]=114; bg[2]=114; }
 		}
-
 	}
 }