[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56689] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: Bug fix, irc submitted

Ton Roosendaal ton at blender.org
Sat May 11 18:15:09 CEST 2013


Revision: 56689
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56689
Author:   ton
Date:     2013-05-11 16:15:09 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Bug fix, irc submitted

If you have three scenes, current is A, others are B and C.

B uses C as background, and C uses B as a background.
(which is possible via linked libraries)

If you then try to use B or C as background of A, code went to eternal loop.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-05-11 15:29:57 UTC (rev 56688)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-05-11 16:15:09 UTC (rev 56689)
@@ -453,6 +453,9 @@
 	for (nested_set = set; nested_set; nested_set = nested_set->set) {
 		if (nested_set == scene)
 			return;
+		/* prevent eternal loops, set can point to next, and next to set, without problems usually */
+		if (nested_set->set == set)
+			return;
 	}
 
 	scene->set = set;




More information about the Bf-blender-cvs mailing list