diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-18 23:00:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-18 23:00:24 +0300 |
| commit | c59370bf643f6e85473c560c8f5edcf73cc36e8e (patch) | |
| tree | 01339cabbc8ed3f877198e7d2c7364847951be29 /intern | |
| parent | be8202d90bd9bd8e87d5111c45fb412925b2d472 (diff) | |
| parent | 08871b56bc4db884ce127deb0ea247e740efe813 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 2 | ||||
| -rw-r--r-- | intern/numaapi/source/numaapi_win32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 11780062e44..a1a9cfd25f3 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -647,7 +647,7 @@ void ShaderManager::get_requested_graph_features(ShaderGraph *graph, node->get_group()); requested_features->nodes_features |= node->get_feature(); if(node->special_type == SHADER_SPECIAL_TYPE_CLOSURE) { - BsdfNode *bsdf_node = static_cast<BsdfNode*>(node); + BsdfBaseNode *bsdf_node = static_cast<BsdfBaseNode*>(node); if(CLOSURE_IS_VOLUME(bsdf_node->closure)) { requested_features->nodes_features |= NODE_FEATURE_VOLUME; } diff --git a/intern/numaapi/source/numaapi_win32.c b/intern/numaapi/source/numaapi_win32.c index e278ef612fd..8f1137a7bea 100644 --- a/intern/numaapi/source/numaapi_win32.c +++ b/intern/numaapi/source/numaapi_win32.c @@ -163,7 +163,7 @@ NUMAAPI_Result numaAPI_Initialize(void) { //////////////////////////////////////////////////////////////////////////////// // Internal helpers. -static int countNumSetBits(int64_t mask) { +static int countNumSetBits(ULONGLONG mask) { // TODO(sergey): There might be faster way calculating number of set bits. int num_bits = 0; while (mask != 0) { |