diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
commit | 5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89 (patch) | |
tree | 478091477aea6fc67186cfcf2ddcd17a214b1366 /source/blender/editors/physics/physics_pointcache.c | |
parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/physics_pointcache.c')
-rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index a66dbfc789d..343804726bf 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -140,7 +140,7 @@ static void ptcache_job_endjob(void *customdata) G.is_rendering = false; BKE_spacedata_draw_locks(false); - WM_set_locked_interface(G.main->wm.first, false); + WM_set_locked_interface(G_MAIN->wm.first, false); WM_main_add_notifier(NC_SCENE | ND_FRAME, scene); WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, job->baker->pid.ob); |