[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51592] trunk/blender/source/blender/ blenloader/intern/readfile.c: set default value of defocus maxblur when this is unset during reading.

[Jeroen Bakker]

Revision: 51592
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51592
Author:   jbakker
Date:     2012-10-24 16:00:27 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
set default value of defocus maxblur when this is unset during reading.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-24 15:43:42 UTC (rev 51591)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-24 16:00:27 UTC (rev 51592)
@@ -7036,6 +7036,20 @@
 	}
 }
 
+static void do_version_ntree_defocus_264(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
+{
+	bNode *node;
+
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == CMP_NODE_DEFOCUS) {
+			NodeDefocus *data = node->storage;
+			if (data->maxblur == 0.0f) {
+				data->maxblur = 16.0f;
+			}
+		}
+	}
+}
+
 static void do_version_ntree_mask_264(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
 {
 	bNode *node;
@@ -7806,6 +7820,7 @@
 	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 10)) {
 		{
 			Scene *scene;
+			bNodeTreeType *ntreetype;
 			// composite redesign
 			for (scene=main->scene.first; scene; scene=scene->id.next) {
 				if (scene->nodetree) {
@@ -7814,6 +7829,11 @@
 					}
 				}
 			}
+			ntreetype = ntreeGetType(NTREE_COMPOSIT);
+	
+			if (ntreetype && ntreetype->foreach_nodetree)
+				ntreetype->foreach_nodetree(main, NULL, do_version_ntree_defocus_264);
+			
 		}
 
 		{