diff --git a/MeddleTools/node_groups.py b/MeddleTools/node_groups.py index 469e187..b85740f 100644 --- a/MeddleTools/node_groups.py +++ b/MeddleTools/node_groups.py @@ -339,6 +339,8 @@ def apply(self, groupNode, properties): 'meddle charactertattoo.shpk', [ PngMapping('g_SamplerNormal_PngCachePath', 'g_SamplerNormal', 'g_SamplerNormal_alpha', 'Non-Color'), + FloatRgbMapping('OptionColor', 'OptionColor'), + # DecalColor mapping to g_DecalColor <- not implemented ] ) diff --git a/MeddleTools/shader_fix.py b/MeddleTools/shader_fix.py index dd36ba8..e7226d2 100644 --- a/MeddleTools/shader_fix.py +++ b/MeddleTools/shader_fix.py @@ -113,12 +113,12 @@ def shpkMtrlFixer(object: bpy.types.Object, mat: bpy.types.Material, directory: return {'CANCELLED'} groupNode.node_tree = nodeGroupData - groupNode.location = (10, 300) + groupNode.location = (200, 300) groupNode.width = 300 # create principal bsdf node bsdfNode = material.nodes.new('ShaderNodeBsdfPrincipled') - bsdfNode.location = (-300, 300) + bsdfNode.location = (600, 300) bsdfNode.width = 300 # connect groupNode outputs to bsdf inputs @@ -138,7 +138,7 @@ def shpkMtrlFixer(object: bpy.types.Object, mat: bpy.types.Material, directory: materialOutput = material.nodes['Material Output'] surfaceInput = materialOutput.inputs['Surface'] bsdfOutput = bsdfNode.outputs['BSDF'] - materialOutput.location = (500, 300) + materialOutput.location = (1000, 300) material.links.new(bsdfOutput, surfaceInput) node_height = 300 diff --git a/MeddleTools/shaders.blend b/MeddleTools/shaders.blend index 2df2206..09b2a29 100644 Binary files a/MeddleTools/shaders.blend and b/MeddleTools/shaders.blend differ diff --git a/MeddleTools/shaders.blend1 b/MeddleTools/shaders.blend1 index 948eddb..8bf9ac9 100644 Binary files a/MeddleTools/shaders.blend1 and b/MeddleTools/shaders.blend1 differ