Merge branch 'master' into blender2.8

2018-11-09 15:22:21 +01:00
parent 78a6689aea e6573138f7
commit 9c1c2a40bf
1 changed files with 0 additions and 3 deletions
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -172,9 +172,6 @@ protected:

 	/* Update tile manager to reflect resumable render settings. */
 	void update_resumable_tile_manager(int num_samples);
-
-	/* Add metadata for cryptomatte layers to the render result. */
-	void add_cryptomatte_metadata(string layer_prefix);
 };

 CCL_NAMESPACE_END