diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-03 16:58:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-03 16:58:14 +0300 |
| commit | 2adece9fbb60227fc326926a7fa52aba02c5a56e (patch) | |
| tree | 760be9f5d0908695b8cf6b6c1aab0e3b2d93bff1 /intern/cycles/app | |
| parent | 8d575899a17f12681beb9bdb3f7d3005d6d12103 (diff) | |
| parent | dab20bd41ff9b2545952fa8715e2467b22900133 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 2d6e63468af..21ae07e23b8 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -204,7 +204,7 @@ static void xml_read_camera(XMLReadState& state, xml_node node) cam->matrix = state.tfm; cam->need_update = true; - cam->update(); + cam->update(state.scene); } /* Shader */ @@ -515,7 +515,7 @@ static void xml_read_mesh(const XMLReadState& state, xml_node node) xml_read_float(&sdparams.dicing_rate, node, "dicing_rate"); sdparams.dicing_rate = std::max(0.1f, sdparams.dicing_rate); - state.scene->camera->update(); + state.scene->camera->update(state.scene); sdparams.camera = state.scene->camera; sdparams.objecttoworld = state.tfm; } |