Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-19 20:30:47 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-19 20:30:47 +0300
commitd44c40d91c3c9969729ed24241d518b3e9dd46f1 (patch)
treeede9d3b308fa20a347f5d6c48734b08a802542de /source/blender/editors/render/render_internal.c
parent9c20de8998ac8fbbe9c48de250380b1ffc39b845 (diff)
Cleanup: some more valid G.main usages moved to G_MAIN.
Diffstat (limited to 'source/blender/editors/render/render_internal.c')
-rw-r--r--source/blender/editors/render/render_internal.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index d990f0b34d0..6a5844e323f 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -673,14 +673,14 @@ static void render_endjob(void *rjv)
* would be re-assigned. assign dummy callbacks to avoid referencing freed renderjobs bug [#24508] */
RE_InitRenderCB(rj->re);
- if (rj->main != G.main)
+ if (rj->main != G_MAIN)
BKE_main_free(rj->main);
/* else the frame will not update for the original value */
if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
/* possible this fails of loading new file while rendering */
- if (G.main->wm.first) {
- ED_update_for_newframe(G.main, rj->depsgraph);
+ if (G_MAIN->wm.first) {
+ ED_update_for_newframe(G_MAIN, rj->depsgraph);
}
}
@@ -741,7 +741,7 @@ static void render_endjob(void *rjv)
* and using one from Global will unlock exactly the same manager as
* was locked before running the job.
*/
- WM_set_locked_interface(G.main->wm.first, false);
+ WM_set_locked_interface(G_MAIN->wm.first, false);
/* We've freed all the derived caches before rendering, which is
* effectively the same as if we re-loaded the file.
@@ -749,11 +749,11 @@ static void render_endjob(void *rjv)
* So let's not try being smart here and just reset all updated
* scene layers and use generic DAG_on_visible_update.
*/
- for (scene = G.main->scene.first; scene; scene = scene->id.next) {
+ for (scene = G_MAIN->scene.first; scene; scene = scene->id.next) {
scene->lay_updated = 0;
}
- DEG_on_visible_update(G.main, false);
+ DEG_on_visible_update(G_MAIN, false);
}
}