Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 14:22:21 +0000 (15:22 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 14:22:21 +0000 (15:22 +0100)
intern/cycles/blender/blender_session.h

index 5db71873946ce2f9b6fef996fb7b88e8c6fc2129..99b14a09a5cbd051934aa2e967d141980b956793 100644 (file)
@@ -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