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/kernel/shaders/node_color.h | |
| parent | 525be2f579c994777328bd7ac206be4769d3e6a4 (diff) | |
| parent | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/shaders/node_color.h')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_color.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_color.h b/intern/cycles/kernel/shaders/node_color.h index 4a17286a07f..2c3a810cb18 100644 --- a/intern/cycles/kernel/shaders/node_color.h +++ b/intern/cycles/kernel/shaders/node_color.h @@ -14,6 +14,8 @@ * limitations under the License. */ +/* TODO(lukas): Fix colors in OSL. */ + float color_srgb_to_scene_linear(float c) { if (c < 0.04045) |