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/blender/blender_util.h
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/blender/blender_util.h')
-rw-r--r--intern/cycles/blender/blender_util.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index ec836bd5ec1..f302b09459f 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -628,6 +628,11 @@ public:
b_recalc.insert(id.ptr.data);
}
+ void set_recalc(void *id_ptr)
+ {
+ b_recalc.insert(id_ptr);
+ }
+
bool has_recalc()
{
return !(b_recalc.empty());
@@ -723,6 +728,11 @@ public:
return deleted;
}
+ const map<K, T*>& key_to_scene_data()
+ {
+ return b_map;
+ }
+
protected:
vector<T*> *scene_data;
map<K, T*> b_map;