Merge branch 'Development' into node-groups

Author: pragma37

BlenderMalt/MaltMaterial.py

@@ -1,6 +1,6 @@
 import os
 import bpy
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 from . MaltProperties import MaltPropertyGroup
 
 _MATERIALS = {}
@@ -28,7 +28,7 @@ def poll_tree(self, object):
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     shader_source : bpy.props.StringProperty(name="Shader Source", subtype='FILE_PATH', update=update_source,
-        set=malt_path_setter('shader_source'), get=malt_path_getter('shader_source'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     shader_nodes : bpy.props.PointerProperty(name="Node Tree", type=bpy.types.NodeTree, update=update_nodes, poll=poll_tree,

BlenderMalt/MaltNodes/MaltNodeTree.py

@@ -3,7 +3,7 @@
 import bpy
 from BlenderMalt.MaltProperties import MaltPropertyGroup
 from BlenderMalt import MaltPipeline
-from BlenderMalt.MaltUtils import malt_path_setter, malt_path_getter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 
 from BlenderMalt.MaltNodes.MaltNode import MaltNode
 
@@ -73,7 +73,7 @@ def update_graph_type(self, context):
     library_source : bpy.props.StringProperty(name="Local Library", subtype='FILE_PATH',
         options={'LIBRARY_EDITABLE'},
         override={'LIBRARY_OVERRIDABLE'},
-        set=malt_path_setter('library_source'), get=malt_path_getter('library_source'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     disable_updates : bpy.props.BoolProperty(name="Disable Updates", default=False,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})

BlenderMalt/MaltNodes/MaltNodeUITools.py

@@ -418,100 +418,6 @@ def get_absolute_node_position(node: bpy.types.Node):
         return node.location
     return get_absolute_node_position(node.parent) + node.location
 
-# Blender 3.4 changed the way add_search works and broke NodeItems searches
-# See https://developer.blender.org/T103108
-# This is a copy of the 3.3 NODE_OT_add_search operator so we can get the functionality back
-from bl_operators.node import *
-class NODE_OT_malt_add_search(NodeAddOperator, Operator):
-    '''Add a node to the active tree'''
-    bl_idname = "node.malt_add_search"
-    bl_label = "Search and Add Node"
-    bl_options = {'REGISTER', 'UNDO'}
-    bl_property = "node_item"
-
-    @classmethod
-    def poll(cls, context):
-        return is_malt_tree_context(context)
-
-    _enum_item_hack = []
-
-    # Create an enum list from node items
-    def node_enum_items(self, context):
-        import nodeitems_utils
-
-        enum_items = NODE_OT_malt_add_search._enum_item_hack
-        enum_items.clear()
-
-        for index, item in enumerate(nodeitems_utils.node_items_iter(context)):
-            if isinstance(item, nodeitems_utils.NodeItem):
-                enum_items.append(
-                    (str(index),
-                     item.label,
-                     "",
-                     index,
-                     ))
-        return enum_items
-
-    # Look up the item based on index
-    def find_node_item(self, context):
-        import nodeitems_utils
-
-        node_item = int(self.node_item)
-        for index, item in enumerate(nodeitems_utils.node_items_iter(context)):
-            if index == node_item:
-                return item
-        return None
-
-    node_item: bpy.props.EnumProperty(
-        name="Node Type",
-        description="Node type",
-        items=node_enum_items,
-    )
-
-    def execute(self, context):
-        item = self.find_node_item(context)
-
-        # no need to keep
-        self._enum_item_hack.clear()
-
-        if item:
-            # apply settings from the node item
-            for setting in item.settings.items():
-                ops = self.settings.add()
-                ops.name = setting[0]
-                ops.value = setting[1]
-
-            self.create_node(context, item.nodetype)
-
-            if self.use_transform:
-                bpy.ops.node.translate_attach_remove_on_cancel(
-                    'INVOKE_DEFAULT')
-
-            return {'FINISHED'}
-        else:
-            return {'CANCELLED'}
-
-    def invoke(self, context, event):
-        self.store_mouse_cursor(context, event)
-        # Delayed execution in the search popup
-        context.window_manager.invoke_search_popup(self)
-        return {'CANCELLED'}
-
-def draw_malt_add_search_menu(menu, context):
-    if context.area.ui_type != 'MaltTree':
-        return
-    layout = menu.layout
-    if is_malt_tree_context(context) == False:
-        layout.label(text="No node tree selected", icon='ERROR')
-    elif context.space_data.edit_tree.graph_type == '':
-        layout.label(text="No node tree type selected", icon='ERROR')
-    else:
-        row = layout.row()
-        row.operator_context = "INVOKE_DEFAULT"
-        operator = row.operator("node.malt_add_search", text="Search... (Malt)", icon='VIEW_ZOOM')
-        operator.use_transform = True
-
-
 classes = [
     NodeTreePreview,
     OT_MaltEditNodeTree,
@@ -521,7 +427,6 @@ def draw_malt_add_search_menu(menu, context):
     OT_MaltAddNodeGroup,
     OT_MaltNodesToGroup,
     NODE_OT_add_malt_subcategory_node,
-    NODE_OT_malt_add_search,
 ]
 
 class MaltNodeDrawCallbacks:
@@ -630,12 +535,8 @@ def register():
     NodeTree.tree_preview = PointerProperty(type=NodeTreePreview, name='Node Tree Preview',
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
-    bpy.types.NODE_MT_add.prepend(draw_malt_add_search_menu)
-
 
 def unregister():
-    bpy.types.NODE_MT_add.remove(draw_malt_add_search_menu)
-    
     del NodeTree.tree_preview
 
     for km, kmi in keymaps:

BlenderMalt/MaltPipeline.py

@@ -1,6 +1,6 @@
 import os, platform, time
 import bpy
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 from . import MaltMaterial, MaltMeshes, MaltTextures
 
 _BRIDGE = None
@@ -106,11 +106,11 @@ def update_pipeline_settings(self, context):
         self.update_pipeline(context)
 
     pipeline : bpy.props.StringProperty(name="Malt Pipeline", subtype='FILE_PATH', update=update_pipeline_settings,
-        set=malt_path_setter('pipeline'), get=malt_path_getter('pipeline'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     plugins_dir : bpy.props.StringProperty(name="Local Plugins", subtype='DIR_PATH', update=update_pipeline_settings,
-        set=malt_path_setter('plugins_dir'), get=malt_path_getter('plugins_dir'),
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform,
         options={'LIBRARY_EDITABLE'}, override={'LIBRARY_OVERRIDABLE'})
 
     viewport_bit_depth : bpy.props.EnumProperty(items=[('8', '8', ''),('16', '16', ''),('32', '32', '')], 

BlenderMalt/MaltUtils.py

@@ -25,15 +25,11 @@ def invoke(self, context, event):
         return {'RUNNING_MODAL'}
 
 # Always store paths in UNIX format so saved files work across OSs
-def malt_path_setter(property_name):
-    def setter(self, value):
-        self[property_name] = value.replace('\\','/')
-    return setter
-
-def malt_path_getter(property_name):
-    def getter(self):
-        return self.get(property_name,'').replace('\\','/')
-    return getter
+def malt_path_set_transform(self, new_value, curr_value, is_set):
+    return new_value.replace('\\','/')
+
+def malt_path_get_transform(self, curr_value, is_set):
+    return curr_value.replace('\\','/')
 
 # Operator buttons are generated every time the UI is redrawn.
 # The UI is redrawn for every frame the cursor hovers over it

BlenderMalt/__init__.py

@@ -21,7 +21,7 @@
 __MALT_DEPENDENCIES_PATH = path.join(__MALT_PATH,'Malt','.Dependencies-{}'.format(_PY_VERSION))
 if __MALT_DEPENDENCIES_PATH not in sys.path: sys.path.append(__MALT_DEPENDENCIES_PATH)
 
-from BlenderMalt.MaltUtils import malt_path_getter, malt_path_setter
+from BlenderMalt.MaltUtils import malt_path_set_transform, malt_path_get_transform
 
 class Preferences(bpy.types.AddonPreferences):
     # this must match the addon name
@@ -31,13 +31,13 @@ class Preferences(bpy.types.AddonPreferences):
         description="Setups a VSCode project on your .blend file folder")
 
     renderdoc_path : bpy.props.StringProperty(name="RenderDoc Path", subtype='FILE_PATH',
-        set=malt_path_setter('renderdoc_path'), get=malt_path_getter('renderdoc_path'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     plugins_dir : bpy.props.StringProperty(name="Global Plugins", subtype='DIR_PATH',
-        set=malt_path_setter('plugins_dir'), get=malt_path_getter('plugins_dir'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     docs_path : bpy.props.StringProperty(name="Docs Path", subtype='DIR_PATH',
-        set=malt_path_setter('docs_path'), get=malt_path_getter('docs_path'))
+        set_transform=malt_path_set_transform, get_transform=malt_path_get_transform)
 
     render_fps_cap : bpy.props.IntProperty(name="Max Viewport Render Framerate", default=30)
 

Malt/GL/Shader.py

@@ -169,6 +169,17 @@ def shader_preprocessor(shader_source, include_directories=[], definitions=[]):
     dependencies_path = os.path.join(os.path.dirname(__file__), '..', f'.Dependencies-{py_version}')
     mcpp = os.path.join(dependencies_path, f'mcpp-{platform.system()}')
 
+    if platform.system() == "Linux":
+        # NixOS and Guix System will cannot run the included mcpp binary
+        result = subprocess.run(f'"{mcpp}"', shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        if result.returncode != 0:
+            # Search for system mcpp
+            for directory in os.get_exec_path():
+                path = os.path.join(directory, "mcpp")
+                if os.path.isfile(path) and os.access(path, os.X_OK):
+                    mcpp = path
+
+
     command = f'"{mcpp}"'
     command += ' -C' #keep comments
     for directory in include_directories:

Malt/PipelineParameters.py

@@ -124,6 +124,18 @@ def __init__(self, options, default_option, filter=None, doc=None):
 
     def from_index(self, index):
         return self.enum_options[index]
+    
+class FloatParameter(Parameter):
+    def __init__(self, default_value, min=None, max=None, size=1, filter=None, doc=None):
+        self.min = min
+        self.max = max
+        super().__init__(default_value, Type.FLOAT, size, filter, None, doc)
+
+class IntParameter(Parameter):
+    def __init__(self, default_value, min=None, max=None, size=1, filter=None, doc=None):
+        self.min = min
+        self.max = max
+        super().__init__(default_value, Type.INT, size, filter, None, doc)
 
 def gl_type_to_malt_type(gl_type):
     from Malt.GL import GL