diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-05-25 18:03:54 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-05-25 18:03:54 +0300 |
| commit | 00955cd31eda95aca619842064d22663af4c812b (patch) | |
| tree | 85a4650d260f2fdc250d433d51d7309b77f08510 /source/blender/nodes/intern/node_socket.cc | |
| parent | fd94e033446c72fb92048a9864c1d539fccde59a (diff) | |
Revert "Blenlib: Explicit Colors."
This reverts commit fd94e033446c72fb92048a9864c1d539fccde59a.
does not compile against latest master.
Diffstat (limited to 'source/blender/nodes/intern/node_socket.cc')
| -rw-r--r-- | source/blender/nodes/intern/node_socket.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index 783a7a9b3d8..ce2848b52a0 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -637,9 +637,9 @@ static bNodeSocketType *make_socket_type_vector(PropertySubType subtype) static bNodeSocketType *make_socket_type_rgba() { bNodeSocketType *socktype = make_standard_socket_type(SOCK_RGBA, PROP_NONE); - socktype->get_cpp_type = []() { return &blender::fn::CPPType::get<blender::ColorGeometry4f>(); }; + socktype->get_cpp_type = []() { return &blender::fn::CPPType::get<blender::Color4f>(); }; socktype->get_cpp_value = [](const bNodeSocket &socket, void *r_value) { - *(blender::ColorGeometry4f *)r_value = ((bNodeSocketValueRGBA *)socket.default_value)->value; + *(blender::Color4f *)r_value = ((bNodeSocketValueRGBA *)socket.default_value)->value; }; return socktype; } |