From 0dac56dbdf6ce72a29c2960e090264488ab8681c Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Wed, 10 Nov 2021 16:39:06 +1100
Subject: [PATCH] Fix bug where diffuse colour was not correctly extracted from
 nodes

---
 src/blenderbim/blenderbim/tool/style.py | 10 +++++-----
 src/blenderbim/test/tool/test_style.py  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/blenderbim/blenderbim/tool/style.py b/src/blenderbim/blenderbim/tool/style.py
index 43416fe1e9..501d86f2e5 100644
--- a/src/blenderbim/blenderbim/tool/style.py
+++ b/src/blenderbim/blenderbim/tool/style.py
@@ -51,11 +51,11 @@ class Style(blenderbim.core.tool.Style):
     @classmethod
     def get_surface_rendering_attributes(cls, obj):
         transparency = obj.diffuse_color[3]
-        diffuse_colour = obj.diffuse_color
+        diffuse_color = obj.diffuse_color
         if obj.use_nodes and hasattr(obj.node_tree, "nodes") and "Principled BSDF" in obj.node_tree.nodes:
             bsdf = obj.node_tree.nodes["Principled BSDF"]
             transparency = bsdf.inputs["Alpha"].default_value
-            diffuse_colour = bsdf.inputs["Base Color"].default_value
+            diffuse_color = bsdf.inputs["Base Color"].default_value
         transparency = 1 - transparency
         return {
             "SurfaceColour": {
@@ -67,9 +67,9 @@ class Style(blenderbim.core.tool.Style):
             "Transparency": transparency,
             "DiffuseColour": {
                 "Name": None,
-                "Red": obj.diffuse_color[0],
-                "Green": obj.diffuse_color[1],
-                "Blue": obj.diffuse_color[2],
+                "Red": diffuse_color[0],
+                "Green": diffuse_color[1],
+                "Blue": diffuse_color[2],
             },
         }
 
diff --git a/src/blenderbim/test/tool/test_style.py b/src/blenderbim/test/tool/test_style.py
index 6b2fc509bb..44c501bee1 100644
--- a/src/blenderbim/test/tool/test_style.py
+++ b/src/blenderbim/test/tool/test_style.py
@@ -112,9 +112,9 @@ class TestGetSurfaceRenderingAttributes(NewFile):
             "Transparency": 1 - node.inputs["Alpha"].default_value,
             "DiffuseColour": {
                 "Name": None,
-                "Red": 1,
-                "Green": 1,
-                "Blue": 1,
+                "Red": 0.5,
+                "Green": 0.5,
+                "Blue": 0.5,
             },
         }