Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2022-11-12 16:23:32 +0300
committerJacques Lucke <jacques@blender.org>2022-11-12 16:23:32 +0300
commitdb25e64f6a9a1c14744d208be5cd446d3337101a (patch)
tree4f87b4e8242f59de45dcf8ab97a06fb1ff178692
parentb5e82ff93d147ed8cb005808803d67baabf7b3ce (diff)
parentf8d968a13c5d9b1b4a30602412644ab20b2b6f74 (diff)
Merge branch 'blender-v3.4-release'
-rw-r--r--source/blender/editors/space_node/node_draw.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 5ae6573df7c..151f04e0a2d 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -854,6 +854,11 @@ static void create_inspection_string_for_generic_value(const GPointer value, std
else if (type.is<blender::float3>()) {
ss << *(blender::float3 *)buffer << TIP_(" (Vector)");
}
+ else if (type.is<blender::ColorGeometry4f>()) {
+ const blender::ColorGeometry4f &color = *(blender::ColorGeometry4f *)buffer;
+ ss << "(" << color.r << ", " << color.g << ", " << color.b << ", " << color.a << ")"
+ << TIP_(" (Color)");
+ }
else if (type.is<bool>()) {
ss << ((*(bool *)buffer) ? TIP_("True") : TIP_("False")) << TIP_(" (Boolean)");
}