diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
| commit | 27de412ca8de4edad99a46ebdb8aadd7003e42a6 (patch) | |
| tree | 4e2659e3490519021195ba626de74adc4813e825 /intern/cycles/render/shader.h | |
| parent | 525be2f579c994777328bd7ac206be4769d3e6a4 (diff) | |
| parent | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index ffaef522124..d787c3b266b 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -196,6 +196,8 @@ public: static void free_memory(); + float linear_rgb_to_gray(float3 c); + protected: ShaderManager(); @@ -212,6 +214,11 @@ protected: DeviceRequestedFeatures *requested_features); thread_spin_lock attribute_lock_; + + float3 xyz_to_r; + float3 xyz_to_g; + float3 xyz_to_b; + float3 rgb_to_y; }; CCL_NAMESPACE_END |