Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-06-01 13:52:00 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-01 17:49:52 +0300
commitf45f2ac68732aae68cb13103795ba9303fa5da77 (patch)
treea47debd0bd953cff2fbd30767e09ca1467aada3f /intern/cycles/render/shader.h
parent4d8cf1329df3cf545acbe369e3d7c39428cf91d2 (diff)
Cycles: Fix missing features gathering from the bump graph
Diffstat (limited to 'intern/cycles/render/shader.h')
-rw-r--r--intern/cycles/render/shader.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 27b239601d0..64d45635ef1 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -166,7 +166,9 @@ public:
static void add_default(Scene *scene);
/* Selective nodes compilation. */
- void get_requested_features(Scene *scene, int& max_group, int& features);
+ void get_requested_features(Scene *scene,
+ int& max_group,
+ int& features);
protected:
ShaderManager();
@@ -178,6 +180,10 @@ protected:
static vector<float> beckmann_table;
size_t beckmann_table_offset;
+
+ void get_requested_graph_features(ShaderGraph *graph,
+ int& max_group,
+ int& features);
};
CCL_NAMESPACE_END