Commit: d1313ab74e15e77d815867374bedc6588688ca82 Author: Brecht Van Lommel Date: Thu Sep 9 19:47:52 2021 +0200 Branches: cycles-x https://developer.blender.org/rBd1313ab74e15e77d815867374bedc6588688ca82
Merge branch 'master' into cycles-x =================================================================== =================================================================== diff --cc intern/cycles/render/nodes.h index d8ab997a9ea,3013e9b1866..22bdb06b059 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@@ -1373,7 -1549,12 +1373,7 @@@ class CurvesNode : public ShaderNode explicit CurvesNode(const NodeType *node_type); SHADER_NODE_BASE_CLASS(CurvesNode) - NODE_SOCKET_API(array<float3>, curves) - virtual int get_group() - { - return NODE_GROUP_LEVEL_3; - } - + NODE_SOCKET_API_ARRAY(array<float3>, curves) NODE_SOCKET_API(float, min_x) NODE_SOCKET_API(float, max_x) NODE_SOCKET_API(float, fac) @@@ -1402,9 -1583,13 +1402,9 @@@ class RGBRampNode : public ShaderNode public: SHADER_NODE_CLASS(RGBRampNode) void constant_fold(const ConstantFolder &folder); - virtual int get_group() - { - return NODE_GROUP_LEVEL_1; - } - NODE_SOCKET_API(array<float3>, ramp) - NODE_SOCKET_API(array<float>, ramp_alpha) + NODE_SOCKET_API_ARRAY(array<float3>, ramp) + NODE_SOCKET_API_ARRAY(array<float>, ramp_alpha) NODE_SOCKET_API(float, fac) NODE_SOCKET_API(bool, interpolate) }; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs