diff options
author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /intern/cycles/render/graph.h | |
parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'intern/cycles/render/graph.h')
-rw-r--r-- | intern/cycles/render/graph.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/render/graph.h b/intern/cycles/render/graph.h index 0ea7935f714..febd7a76f03 100644 --- a/intern/cycles/render/graph.h +++ b/intern/cycles/render/graph.h @@ -204,10 +204,6 @@ class ShaderNode : public Node { { return false; } - virtual bool has_object_dependency() - { - return false; - } virtual bool has_attribute_dependency() { return false; |