add: material list panel and node editor context

ChaosGroup · Feb 16, 2016 · dad4656 · dad4656
1 parent 8b265b8
commit dad4656
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/nodes/tree.py b/nodes/tree.py
@@ -184,6 +184,30 @@ def get_from_context(cls, context):
         return (None, None, None)
 
 
+class VRayMaterialEditor(VRayNodeTree):
+    bl_label  = "V-Ray Material Editor"
+    bl_idname = 'VRayMaterialEditor'
+    bl_icon   = 'MATERIAL'
+
+    @classmethod
+    def get_from_context(cls, context):
+        VRayExporter = context.scene.vray.Exporter
+
+        listIndex = VRayExporter.materialListIndex if VRayExporter.materialListIndex >= 0 else 0
+        numMaterials = len(bpy.data.materials)
+
+        if numMaterials:
+            if listIndex >= numMaterials:
+                VRayExporter.materialListIndex = 0
+                listIndex                   = 0
+
+            material = bpy.data.materials[listIndex]
+            if material:
+                return material.vray.ntree, material, material
+
+        return (None, None, None)
+
+
 ########  ########  ######   ####  ######  ######## ########     ###    ######## ####  #######  ##    ##
 ##     ## ##       ##    ##   ##  ##    ##    ##    ##     ##   ## ##      ##     ##  ##     ## ###   ##
 ##     ## ##       ##         ##  ##          ##    ##     ##  ##   ##     ##     ##  ##     ## ####  ##
@@ -201,6 +225,7 @@ def GetRegClasses():
         VRayNodeTreeScene,
 
         VRayNodeTreeEditor,
+        VRayMaterialEditor,
     )
 
 

diff --git a/plugins/system/Exporter.py b/plugins/system/Exporter.py
@@ -206,6 +206,13 @@ class VRayExporter(bpy.types.PropertyGroup):
         default     = -1,
     )
 
+    materialListIndex = bpy.props.IntProperty(
+        name        = "Material List Index",
+        description = "Material list index",
+        min         = -1,
+        default     = -1,
+    )
+
     useSeparateFiles = bpy.props.BoolProperty(
         name        = "Separate Files",
         description = "Export plugins to separate files",

diff --git a/ui/classes.py b/ui/classes.py
@@ -522,6 +522,14 @@ def draw_item(self, context, layout, data, item, icon, active_data, active_propn
         layout.label(text=item.name, translate=False)
 
 
+class VRayListMaterials(bpy.types.UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+        split = layout.split(percentage=0.1)
+
+        split.column().prop(item, 'diffuse_color', text="")
+        split.column().label(text=item.name, translate=False)
+
+
 ########  ########  ######   ####  ######  ######## ########     ###    ######## ####  #######  ##    ##
 ##     ## ##       ##    ##   ##  ##    ##    ##    ##     ##   ## ##      ##     ##  ##     ## ###   ##
 ##     ## ##       ##         ##  ##          ##    ##     ##  ##   ##     ##     ##  ##     ## ####  ##
@@ -537,6 +545,7 @@ def GetRegClasses():
         VRayListUse,
         VRayListDR,
         VRayList,
+        VRayListMaterials,
 
         VRayOpListItemNew,
         VRayOpListItemDel,

diff --git a/ui/properties_render_layers.py b/ui/properties_render_layers.py
@@ -95,6 +95,16 @@ def draw(self, context):
 		box_row.operator("vray.remove_fake_textures", text="Remove Unused Data", icon='ERROR')
 
 
+class VRayPanelMaterials(classes.VRayRenderLayersPanel):
+	bl_label   = "Scene Materials"
+	bl_options = {'DEFAULT_CLOSED'}
+
+	def draw(self, context):
+		VRayExporter = context.scene.vray.Exporter
+
+		self.layout.template_list("VRayListMaterials", "", bpy.data, 'materials', VRayExporter, 'materialListIndex', rows=15)
+
+
 class VRayPanelLightLister(classes.VRayRenderLayersPanel):
 	bl_label   = "Lights"
 	bl_options = {'DEFAULT_CLOSED'}
@@ -228,6 +238,7 @@ def renderExportSetItem(layout, item):
 
 def GetRegClasses():
 	return (
+		VRayPanelMaterials,
 		VRayPanelMiscTools,
 		VRayPanelNodeTrees,
 		VRayPanelLightLister,