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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-04 21:06:22 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-04 22:22:31 +0300
commitb2e2db94bdae25b4505df563ae9e56a37d89cb7a (patch)
treee454893e7bc7215de93262f7bb9bad9b62ca7908 /intern/cycles/app
parent59d0582a750cf61c98368dc66277e788dcf6f502 (diff)
Fix T60379: Cycles viewport adaptive subdivision hangs after updates.
The camera world to raster computation was using wrong values. Also fixes update when changing subdivision scene settings.
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_xml.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index d4ee284e24b..86491adb3a4 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -516,8 +516,6 @@ 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);
- sdparams.camera = state.scene->camera;
sdparams.objecttoworld = state.tfm;
}