[Bf-blender-cvs] [f4bcc97] master: Fix Cycles OpenCL not always allocating enough space for closures.
Brecht Van Lommel
noreply at git.blender.org
Sat Jul 30 23:21:14 CEST 2016
Commit: f4bcc97729c430aac16c41f7c012a0f4c1fe6bb2
Author: Brecht Van Lommel
Date: Sat Jul 30 19:16:29 2016 +0200
Branches: master
https://developer.blender.org/rBf4bcc97729c430aac16c41f7c012a0f4c1fe6bb2
Fix Cycles OpenCL not always allocating enough space for closures.
===================================================================
M intern/cycles/render/nodes.h
===================================================================
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 79d25d0..28b40ba 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -350,6 +350,7 @@ public:
float roughness, anisotropy, rotation;
ClosureType distribution;
+ ClosureType get_closure_type() { return distribution; }
void attributes(Shader *shader, AttributeRequestSet *attributes);
};
@@ -385,6 +386,7 @@ public:
void simplify_settings(Scene *scene);
bool has_integrator_dependency();
+ ClosureType get_closure_type() { return distribution; }
float roughness;
ClosureType distribution, distribution_orig;
@@ -396,6 +398,7 @@ public:
void simplify_settings(Scene *scene);
bool has_integrator_dependency();
+ ClosureType get_closure_type() { return distribution; }
float roughness, IOR;
ClosureType distribution, distribution_orig;
@@ -407,6 +410,7 @@ public:
void simplify_settings(Scene *scene);
bool has_integrator_dependency();
+ ClosureType get_closure_type() { return distribution; }
float roughness, IOR;
ClosureType distribution, distribution_orig;
@@ -425,6 +429,7 @@ public:
SHADER_NODE_CLASS(SubsurfaceScatteringNode)
bool has_surface_bssrdf() { return true; }
bool has_bssrdf_bump();
+ ClosureType get_closure_type() { return falloff; }
float scale;
float3 radius;
@@ -519,6 +524,7 @@ public:
class HairBsdfNode : public BsdfNode {
public:
SHADER_NODE_CLASS(HairBsdfNode)
+ ClosureType get_closure_type() { return component; }
ClosureType component;
float offset;
More information about the Bf-blender-cvs
mailing list