diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 17:22:21 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 17:22:21 +0300 |
commit | 9c1c2a40bf73dce1b47d4e1bd865db1c5219fde6 (patch) | |
tree | f30efdb693a9cdecd44091d4a48d1899e3baa55f /intern/cycles | |
parent | 78a6689aea1976d42ba0fca927f3e7572768e1fb (diff) | |
parent | e6573138f73692bacc0474bd3c8d88a03afde1a6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/blender_session.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 5db71873946..99b14a09a5c 100644 --- 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 |