[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46180] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: Fix #31102: changing scene. use_color_management from render_pre callback would crash.

[Brecht Van Lommel]

Revision: 46180
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46180
Author:   blendix
Date:     2012-05-02 09:50:48 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fix #31102: changing scene.use_color_management from render_pre callback would crash.

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	2012-05-02 09:33:45 UTC (rev 46179)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-05-02 09:50:48 UTC (rev 46180)
@@ -1077,8 +1077,11 @@
 	bNode *node;
 	
 	if (ntree && scene->use_nodes) {
-		/* XXX images are freed here, stop render and preview threads, until Image is threadsafe */
-		WM_jobs_stop_all(bmain->wm.first);
+		/* images are freed here, stop render and preview threads, until
+		 * Image is threadsafe. when we are changing this propery from a
+		 * python script in the render thread, don't stop own thread */
+		if(BLI_thread_is_main())
+			WM_jobs_stop_all(bmain->wm.first);
 		
 		for (node = ntree->nodes.first; node; node = node->next) {
 			if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_IMAGE)) {