Merge branch 'develop'

Author: araistrick

infinigen/__init__.py

@@ -6,7 +6,7 @@
 import logging
 from pathlib import Path
 
-__version__ = "1.15.2"
+__version__ = "1.15.3"
 
 
 def repo_root():

infinigen/assets/materials/dev/face_size_visualizer.py

@@ -34,7 +34,7 @@ def geo_face_colors(nw: NodeWrangler):
     random_value = nw.new_node(Nodes.RandomValue, attrs={"data_type": "FLOAT"})
 
     combine = nw.new_node(
-        Nodes.CombineColor,
+        Nodes.FunctionCombineColor,
         input_kwargs={
             0: random_value.outputs["Value"],
             1: 1.0,

infinigen/core/nodes/node_info.py

@@ -40,7 +40,8 @@ class Nodes:
     SeparateColor = "ShaderNodeSeparateColor"
     CompSeparateColor = "CompositorNodeSeparateColor"
     CombineRGB = "ShaderNodeCombineRGB"
-    CombineColor = "FunctionNodeCombineColor"
+    CombineColor = "ShaderNodeCombineColor"
+    FunctionCombineColor = "FunctionNodeCombineColor"
     CompCombineColor = "CompositorNodeCombineColor"
 
     # bl3.5 additions