griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #31102: changing scene.use_color_management from render_pre callback would crash.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-05-02 09:50:48 +00:00
parent 1e2afcddd3
commit afcc42c324
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/makesrna/intern/rna_scene.c
View File

@@ -1077,8 +1077,11 @@ static void rna_RenderSettings_color_management_update(Main *bmain, Scene *UNUSE
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)) {