From c0235da53c374433bf90b53a6b928a1b05b6c322 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 1 Jun 2015 18:55:29 +0500 Subject: Cycles: Fix some typos in the selective modes compilation --- intern/cycles/kernel/svm/svm.h | 2 +- intern/cycles/render/shader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index e5e25eb6ca8..16847cc98ff 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -183,7 +183,7 @@ CCL_NAMESPACE_END CCL_NAMESPACE_BEGIN #define NODES_GROUP(group) ((group) <= __NODES_MAX_GROUP__) -#define NODES_FEATURE(feature) (__NODES_FEATURES__ & (feature) != 0) +#define NODES_FEATURE(feature) ((__NODES_FEATURES__ & (feature)) != 0) /* Main Interpreter Loop */ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderType type, int path_flag) diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index d73d73a0ca8..31be2a3d3f4 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -487,7 +487,7 @@ void ShaderManager::get_requested_graph_features(ShaderGraph *graph, int& features) { foreach(ShaderNode *node, graph->nodes) { - max_group = min(max_group, node->get_group()); + max_group = max(max_group, node->get_group()); features |= node->get_feature(); if(node->special_type == SHADER_SPECIAL_TYPE_CLOSURE) { BsdfNode *bsdf_node = static_cast(node); -- cgit v1.2.3