diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-10-12 16:18:30 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-10-12 16:18:30 +0400 |
| commit | 744aaa955f6b60e8eefb67145d15f1c42e708d2b (patch) | |
| tree | f160609e4ce5a91171da78b8b76966aebe1983b6 | |
| parent | ee5936cf6bb9aa68f80e94ec5d8135cd66d08b70 (diff) | |
Cleanup: Typo fix for Blackbody variable, had different naming in the comments and also in OSL.
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_blackbody.h | 4 | ||||
| -rw-r--r-- | intern/cycles/render/blackbody.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index e5cd23c0925..ca1210f2d80 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -38,7 +38,7 @@ CCL_NAMESPACE_BEGIN #define BSSRDF_MIN_RADIUS 1e-8f #define BSSRDF_MAX_HITS 4 -#define BB_DRAPPER 800.0f +#define BB_DRAPER 800.0f #define BB_MAX_TABLE_RANGE 12000.0f #define BB_TABLE_XPOWER 1.5f #define BB_TABLE_YPOWER 5.0f diff --git a/intern/cycles/kernel/svm/svm_blackbody.h b/intern/cycles/kernel/svm/svm_blackbody.h index 15257aed92e..1e40e868e14 100644 --- a/intern/cycles/kernel/svm/svm_blackbody.h +++ b/intern/cycles/kernel/svm/svm_blackbody.h @@ -42,7 +42,7 @@ ccl_device void svm_node_blackbody(KernelGlobals *kg, ShaderData *sd, float *sta /* Input */ float temperature = stack_load_float(stack, temperature_offset); - if (temperature < BB_DRAPPER) { + if (temperature < BB_DRAPER) { /* just return very very dim red */ color_rgb = make_float3(1.0e-6f,0.0f,0.0f); } @@ -53,7 +53,7 @@ ccl_device void svm_node_blackbody(KernelGlobals *kg, ShaderData *sd, float *sta /* reconstruct a proper index for the table lookup, compared to OSL we don't look up two colors just one (the OSL-lerp is also automatically done for us by "lookup_table_read") */ - float t = powf((temperature - BB_DRAPPER) * (1.0f / BB_TABLE_SPACING), (1.0f / BB_TABLE_XPOWER)); + float t = powf((temperature - BB_DRAPER) * (1.0f / BB_TABLE_SPACING), (1.0f / BB_TABLE_XPOWER)); int blackbody_table_offset = kernel_data.tables.blackbody_offset; diff --git a/intern/cycles/render/blackbody.cpp b/intern/cycles/render/blackbody.cpp index 89af714e8ec..6e2cb7c62b6 100644 --- a/intern/cycles/render/blackbody.cpp +++ b/intern/cycles/render/blackbody.cpp @@ -100,7 +100,7 @@ vector<float> blackbody_table() /* ToDo: bring this back to what OSL does with the lastTemperature limit ? */ for (int i = 0; i <= 317; ++i) { - double Temperature = pow((double)i, (double)BB_TABLE_XPOWER) * (double)BB_TABLE_SPACING + (double)BB_DRAPPER; + double Temperature = pow((double)i, (double)BB_TABLE_XPOWER) * (double)BB_TABLE_SPACING + (double)BB_DRAPER; X = 0; Y = 0; Z = 0; |