[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60010] trunk/blender/source/blender: startup.blend: save images as RGBA by default, to avoid losing data when

[Brecht Van Lommel]

Revision: 60010
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60010
Author:   blendix
Date:     2013-09-10 13:25:37 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
startup.blend: save images as RGBA by default, to avoid losing data when
forgetting to change it from RGB when painting images or saving renders.

This makes more sense in the new alpha pipeline, renders no longer contain an
alpha channel that does not match the RGB channels, so saving files as RGBA
should give the expected results when opening them in other applications.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenloader/intern/versioning_defaults.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2013-09-10 13:25:35 UTC (rev 60009)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2013-09-10 13:25:37 UTC (rev 60010)
@@ -1326,7 +1326,7 @@
 void BKE_imformat_defaults(ImageFormatData *im_format)
 {
 	memset(im_format, 0, sizeof(*im_format));
-	im_format->planes = R_IMF_PLANES_RGB;
+	im_format->planes = R_IMF_PLANES_RGBA;
 	im_format->imtype = R_IMF_IMTYPE_PNG;
 	im_format->depth = R_IMF_CHAN_DEPTH_8;
 	im_format->quality = 90;

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-09-10 13:25:35 UTC (rev 60009)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-09-10 13:25:37 UTC (rev 60010)
@@ -430,7 +430,7 @@
 	sce->r.filtertype = R_FILTER_MITCH;
 	sce->r.size = 50;
 
-	sce->r.im_format.planes = R_IMF_PLANES_RGB;
+	sce->r.im_format.planes = R_IMF_PLANES_RGBA;
 	sce->r.im_format.imtype = R_IMF_IMTYPE_PNG;
 	sce->r.im_format.depth = R_IMF_CHAN_DEPTH_8;
 	sce->r.im_format.quality = 90;

Modified: trunk/blender/source/blender/blenloader/intern/versioning_defaults.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_defaults.c	2013-09-10 13:25:35 UTC (rev 60009)
+++ trunk/blender/source/blender/blenloader/intern/versioning_defaults.c	2013-09-10 13:25:37 UTC (rev 60010)
@@ -38,5 +38,9 @@
  * This function can be emptied each time the startup.blend is updated. */
 void BLO_update_defaults_startup_blend(Main *main)
 {
+	Scene *scene;
+
+	for (scene = main->scene.first; scene; scene = scene->id.next)
+		scene->r.im_format.planes = R_IMF_PLANES_RGBA;
 }