merge upstream
This commit is contained in:
		@ -16,7 +16,7 @@ class CameraGetNode(LnxLogicTreeNode):
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'DOF Distance')#6
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'DOF Length')#7
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'DOF F-Stop')#8
 | 
			
		||||
        self.add_output('LnxBoolSocket', 'Tonemapping')#9
 | 
			
		||||
        self.add_output('LnxIntSocket', 'Tonemapping')#9
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'Distort')#10
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'Film Grain')#11
 | 
			
		||||
        self.add_output('LnxFloatSocket', 'Sharpen')#12
 | 
			
		||||
 | 
			
		||||
@ -16,6 +16,10 @@ class ChromaticAberrationSetNode(LnxLogicTreeNode):
 | 
			
		||||
 | 
			
		||||
        self.add_output('LnxNodeSocketAction', 'Out')
 | 
			
		||||
 | 
			
		||||
    def draw_buttons(self, context, layout):
 | 
			
		||||
        layout.label(text="Type 0: Simple")
 | 
			
		||||
        layout.label(text="Type 1: Spectral")
 | 
			
		||||
 | 
			
		||||
    def get_replacement_node(self, node_tree: bpy.types.NodeTree):
 | 
			
		||||
        if self.lnx_version not in (0, 1):
 | 
			
		||||
            raise LookupError()
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,7 @@ class CameraSetNode(LnxLogicTreeNode):
 | 
			
		||||
    """Set the post-processing effects of a camera."""
 | 
			
		||||
    bl_idname = 'LNCameraSetNode'
 | 
			
		||||
    bl_label = 'Set Camera Post Process'
 | 
			
		||||
    lnx_version = 5
 | 
			
		||||
    lnx_version = 6
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    def remove_extra_inputs(self, context):
 | 
			
		||||
@ -29,7 +29,7 @@ class CameraSetNode(LnxLogicTreeNode):
 | 
			
		||||
        if self.property0 == 'DoF F-Stop':    
 | 
			
		||||
            self.add_input('LnxFloatSocket', 'DoF F-Stop', default_value=128.0)#8
 | 
			
		||||
        if self.property0 == 'Tonemapping':   
 | 
			
		||||
            self.add_input('LnxBoolSocket', 'Tonemapping', default_value=False)#9
 | 
			
		||||
            self.add_input('LnxIntSocket', 'Tonemapping', default_value=5)#9
 | 
			
		||||
        if self.property0 == 'Distort':    
 | 
			
		||||
            self.add_input('LnxFloatSocket', 'Distort', default_value=2.0)#10
 | 
			
		||||
        if self.property0 == 'Film Grain':    
 | 
			
		||||
@ -70,6 +70,13 @@ class CameraSetNode(LnxLogicTreeNode):
 | 
			
		||||
        self.add_output('LnxNodeSocketAction', 'Out')
 | 
			
		||||
 | 
			
		||||
    def draw_buttons(self, context, layout):
 | 
			
		||||
        if self.property0 == 'Tonemapping':
 | 
			
		||||
            layout.label(text="0: Filmic")
 | 
			
		||||
            layout.label(text="1: Filmic2")
 | 
			
		||||
            layout.label(text="2: Reinhard")
 | 
			
		||||
            layout.label(text="3: Uncharted2")
 | 
			
		||||
            layout.label(text="5: Agx")
 | 
			
		||||
            layout.label(text="6: None")
 | 
			
		||||
        layout.prop(self, 'property0')
 | 
			
		||||
        
 | 
			
		||||
    def get_replacement_node(self, node_tree: bpy.types.NodeTree):
 | 
			
		||||
 | 
			
		||||
@ -152,8 +152,12 @@ if bpy.app.version > (4, 1, 0):
 | 
			
		||||
                pass
 | 
			
		||||
            if (node.inputs['Emission Strength'].is_linked or node.inputs['Emission Strength'].default_value != 0.0)\
 | 
			
		||||
                    and (node.inputs['Emission Color'].is_linked or not mat_utils.equals_color_socket(node.inputs['Emission Color'], (0.0, 0.0, 0.0), comp_alpha=False)):
 | 
			
		||||
                emission_col = c.parse_vector_input(node.inputs[26])
 | 
			
		||||
                emission_strength = c.parse_value_input(node.inputs[27])
 | 
			
		||||
                if bpy.app.version >= (4, 4, 0):
 | 
			
		||||
                    emission_col = c.parse_vector_input(node.inputs[27])
 | 
			
		||||
                    emission_strength = c.parse_value_input(node.inputs[28])
 | 
			
		||||
                else:
 | 
			
		||||
                    emission_col = c.parse_vector_input(node.inputs[26])
 | 
			
		||||
                    emission_strength = c.parse_value_input(node.inputs[27])
 | 
			
		||||
                state.out_emission_col = '({0} * {1})'.format(emission_col, emission_strength)
 | 
			
		||||
                mat_state.emission_type = mat_state.EmissionType.SHADED
 | 
			
		||||
            else:
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user