tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: Few more validation of G_MAIN usages...

This commit is contained in:
Bastien Montagne 2018-06-25 12:02:20 +02:00
parent b09387c388
commit f33cb522dd
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/system/PythonInterpreter.h
View File

@ -81,7 +81,7 @@ public:
bool ok = BPY_execute_filepath(_context, fn, reports);
#else
bool ok;
Text *text = BKE_text_load(&_freestyle_bmain, fn, G.main->name);
Text *text = BKE_text_load(&_freestyle_bmain, fn, G_MAIN->name);
if (text) {
ok = BPY_execute_text(_context, text, reports, false);
BKE_libblock_delete(&_freestyle_bmain, text);

5
source/blender/nodes/composite/node_composite_tree.c
View File

@ -280,7 +280,10 @@ void ntreeCompositTagRender(Scene *curscene)
{
Scene *sce;
for (sce = G.main->scene.first; sce; sce = sce->id.next) {
/* XXX Think using G_MAIN here is valid, since you want to update current file's scene nodes,
* not the ones in temp main generated for rendering?
* This is still rather weak though, ideally render struct would store own main AND original G_MAIN... */
for (sce = G_MAIN->scene.first; sce; sce = sce->id.next) {
if (sce->nodetree) {
bNode *node;

2
source/blender/nodes/intern/node_exec.c
View File

@ -163,6 +163,8 @@ bNodeTreeExec *ntree_exec_begin(bNodeExecContext *context, bNodeTree *ntree, bNo
/* XXX texnodes have threading issues with muting, have to disable it there ... */
/* ensure all sock->link pointers and node levels are correct */
/* Using global main here is likely totally wrong, not sure what to do about that one though...
* We cannot even check ntree is in global main, since most of the time it won't be (thanks to ntree design)!!! */
ntreeUpdateTree(G.main, ntree);
/* get a dependency-sorted list of nodes */