[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50720] trunk/blender/source/blender: Color Management: fixed crash when changing display device in screenshot save operator

[Sergey Sharybin]

Revision: 50720
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50720
Author:   nazgul
Date:     2012-09-18 10:11:46 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Color Management: fixed crash when changing display device  in screenshot save operator

In fact, color management settings shouldn't be editing from this operator since
screenshot is using OpenGL which is in sRGB space, but fixed issues with Image
Format initialization and added NULL pointer checks.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/editors/screen/screendump.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2012-09-18 08:40:53 UTC (rev 50719)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2012-09-18 10:11:46 UTC (rev 50720)
@@ -1227,6 +1227,9 @@
 	im_format->imtype = R_IMF_IMTYPE_PNG;
 	im_format->quality = 90;
 	im_format->compress = 90;
+
+	BKE_color_managed_display_settings_init(&im_format->display_settings);
+	BKE_color_managed_view_settings_init(&im_format->view_settings);
 }
 
 void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *imbuf)

Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c	2012-09-18 08:40:53 UTC (rev 50719)
+++ trunk/blender/source/blender/editors/screen/screendump.c	2012-09-18 10:11:46 UTC (rev 50720)
@@ -245,7 +245,7 @@
 
 	/* image template */
 	RNA_pointer_create(NULL, &RNA_ImageFormatSettings, &scd->im_format, &ptr);
-	uiTemplateImageSettings(layout, &ptr, TRUE);
+	uiTemplateImageSettings(layout, &ptr, FALSE);
 
 	/* main draw call */
 	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);

Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-09-18 08:40:53 UTC (rev 50719)
+++ trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-09-18 10:11:46 UTC (rev 50720)
@@ -377,6 +377,9 @@
 {
 	ID *id = ptr->id.data;
 
+	if (!id)
+		return;
+
 	if (GS(id->name) == ID_SCE) {
 		Scene *scene = (Scene *) id;
 
@@ -486,6 +489,9 @@
 {
 	ID *id = ptr->id.data;
 
+	if (!id)
+		return;
+
 	if (GS(id->name) == ID_SCE) {
 		WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, NULL);
 	}