← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/makesrna/intern/rna_scene.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-05-12 20:02:22 UTC
  • mfrom: (14.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20120512200222-lznjs2cxzaq96wua
Tags: 2.63a-1
* New upstream bugfix release
  + debian/patches/: re-worked since source code changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesrna/intern/rna_scene.c
1077
1077
        bNode *node;
1078
1078
        
1079
1079
        if (ntree && scene->use_nodes) {
1080
 
                /* XXX images are freed here, stop render and preview threads, until Image is threadsafe */
1081
 
                WM_jobs_stop_all(bmain->wm.first);
 
1080
                /* images are freed here, stop render and preview threads, until
 
1081
                 * Image is threadsafe. when we are changing this propery from a
 
1082
                 * python script in the render thread, don't stop own thread */
 
1083
                if(BLI_thread_is_main())
 
1084
                        WM_jobs_stop_all(bmain->wm.first);
1082
1085
                
1083
1086
                for (node = ntree->nodes.first; node; node = node->next) {
1084
1087
                        if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_IMAGE)) {