diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 12:02:48 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 12:02:48 +0300 |
commit | 1a79c6d36081268a0f0b9f7650471b09372df121 (patch) | |
tree | 0a645a43e421b961723be2febf17d8a5ac21d83a /source/blender/render/intern | |
parent | f234adf65c2ae741f33f2ed4433f2990d8f6de97 (diff) | |
parent | 67e8c1e1c7cfbb000de903c9c4e83874adba411f (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/particle.c
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 648fbff7b23..809faeb87a4 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1892,7 +1892,7 @@ static void update_physics_cache(Render *re, Scene *scene, ViewLayer *view_layer PTCacheBaker baker; memset(&baker, 0, sizeof(baker)); - baker.main = re->main; + baker.bmain = re->main; baker.scene = scene; baker.view_layer = view_layer; baker.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); |