[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50267] branches/soc-2011-tomato/source/ blender: Color management: fix for wrong view being used as default in configuration file check

[Sergey Sharybin]

Revision: 50267
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50267
Author:   nazgul
Date:     2012-08-29 18:08:34 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Color management: fix for wrong view being used as default in configuration file check

Also marked Jpeg2K as non-float format.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-08-29 17:30:14 UTC (rev 50266)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-08-29 18:08:34 UTC (rev 50267)
@@ -1024,7 +1024,6 @@
 		case R_IMF_IMTYPE_RADHDR:
 		case R_IMF_IMTYPE_OPENEXR:
 		case R_IMF_IMTYPE_MULTILAYER:
-		case R_IMF_IMTYPE_JP2:
 			return TRUE;
 	}
 	return 0;

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-08-29 17:30:14 UTC (rev 50266)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-08-29 18:08:34 UTC (rev 50267)
@@ -1404,17 +1404,29 @@
 static void colormanage_check_view_settings(ColorManagedViewSettings *view_settings, const char *what,
                                             const ColorManagedView *default_view)
 {
+	ColorManagedDisplay *display;
+	ColorManagedView *default_view;
+
 	if (view_settings->view_transform[0] == '\0') {
-		BLI_strncpy(view_settings->view_transform, default_view->name, sizeof(view_settings->view_transform));
+		display = colormanage_display_get_named(display_settings->display_device);
+		default_view = colormanage_view_get_default(display);
+
+		if (default_view)
+			BLI_strncpy(view_settings->view_transform, default_view->name, sizeof(view_settings->view_transform));
 	}
 	else {
 		ColorManagedView *view = colormanage_view_get_named(view_settings->view_transform);
 
 		if (!view) {
-			printf("Blender color management: %s view \"%s\" not found, setting default \"%s\".\n",
-			       what, view_settings->view_transform, default_view->name);
+			display = colormanage_display_get_named(display_settings->display_device);
+			default_view = colormanage_view_get_default(display);
 
-			BLI_strncpy(view_settings->view_transform, default_view->name, sizeof(view_settings->view_transform));
+			if (default_view) {
+				printf("Blender color management: %s view \"%s\" not found, setting default \"%s\".\n",
+				       what, view_settings->view_transform, default_view->name);
+
+				BLI_strncpy(view_settings->view_transform, default_view->name, sizeof(view_settings->view_transform));
+			}
 		}
 	}
 
@@ -1456,7 +1468,6 @@
 	MovieClip *clip;
 
 	ColorManagedDisplay *default_display;
-	ColorManagedView *default_view;
 
 	default_display = colormanage_display_get_default();
 
@@ -1465,16 +1476,9 @@
 		return;
 	}
 
-	default_view = colormanage_view_get_default(default_display);
-
-	if (!default_view) {
-		/* happens when OCIO configuration is incorrect */
-		return;
-	}
-
 	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 		colormanage_check_display_settings(&scene->display_settings, "scene", default_display);
-		colormanage_check_view_settings(&scene->view_settings, "scene", default_view);
+		colormanage_check_view_settings(&scene->display_settings, &scene->view_settings, "scene", default_view);
 	}
 
 	/* ** check input color space settings ** */