[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51983] trunk/blender/source/blender/ editors/render/render_update.c: Fix #33114: crash with render frame update script and GLSL.

[Brecht Van Lommel]

Revision: 51983
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51983
Author:   blendix
Date:     2012-11-07 16:27:18 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Fix #33114: crash with render frame update script and GLSL.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_update.c

Modified: trunk/blender/source/blender/editors/render/render_update.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_update.c	2012-11-07 16:18:20 UTC (rev 51982)
+++ trunk/blender/source/blender/editors/render/render_update.c	2012-11-07 16:27:18 UTC (rev 51983)
@@ -378,6 +378,12 @@
 
 void ED_render_id_flush_update(Main *bmain, ID *id)
 {
+	/* this can be called from render or baking thread when a python script makes
+	 * changes, in that case we don't want to do any editor updates, and making
+	 * GPU changes is not possible because OpenGL only works in the main thread */
+	if (!BLI_thread_is_main())
+		return;
+
 	switch (GS(id->name)) {
 		case ID_MA:
 			material_changed(bmain, (Material *)id);