diff options
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index b267731abe5..1dee47c7731 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -11,13 +11,22 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ #ifndef __SHADER_H__ #define __SHADER_H__ #ifdef WITH_OSL +# if defined(_MSC_VER) +/* Prevent OSL from polluting the context with weird macros from windows.h. + * TODO(sergey): Ideally it's only enough to have class/struct declarations in + * the header and skip header include here. + */ +# define NOGDI +# define NOMINMAX +# define WIN32_LEAN_AND_MEAN +# endif # include <OSL/oslexec.h> #endif @@ -97,6 +106,7 @@ public: bool has_converter_blackbody; bool has_bssrdf_bump; bool has_heterogeneous_volume; + bool has_object_dependency; /* requested mesh attributes */ AttributeRequestSet attributes; @@ -161,6 +171,9 @@ protected: typedef unordered_map<ustring, uint, ustringHash> AttributeIDMap; AttributeIDMap unique_attribute_id; + vector<float> blackbody_table; + vector<float> beckmann_table; + size_t blackbody_table_offset; size_t beckmann_table_offset; }; |