Commit: 3a9c61a7980b689b2937bc687016ea79186a4012
Author: Kévin Dietrich
Date: Thu Oct 22 13:19:18 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB3a9c61a7980b689b2937bc687016ea79186a4012
fix up ConvertNode before merge
===================================================================
M intern/cycles/render/nodes.h
===================================================================
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 66cf354b805..fda3960ac39 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -505,9 +505,9 @@ class ConvertNode : public ShaderNode {
void constant_fold(const ConstantFolder &folder);
+private:
SocketType::Type from, to;
- // xxx
union {
float value_float;
int value_int;
@@ -518,7 +518,6 @@ class ConvertNode : public ShaderNode {
};
ustring value_string;
- private:
static const int MAX_TYPE = 12;
static bool register_types();
static Node *create(const NodeType *type);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
