From b2e2db94bdae25b4505df563ae9e56a37d89cb7a Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Thu, 4 Apr 2019 20:06:22 +0200
Subject: 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.
---
 intern/cycles/blender/blender_util.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'intern/cycles/blender/blender_util.h')

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;
-- 
cgit v1.2.3