Merge pull request #46 from SevenNeumann/master

Icons branch pull request
aachman98 · Jun 17, 2019 · f1a5349 · f1a5349
2 parents de33304 + bc0aba2
commit f1a5349
Show file tree

Hide file tree

Showing 62 changed files with 21 additions and 21 deletions.
diff --git a/__init__.py b/__init__.py
@@ -714,7 +714,7 @@ def functionality(self):
         bpy.ops.mesh.primitive_grid_add(x_subdivisions=self.inputs["X Subdivisions"].execute(), y_subdivisions=self.inputs["Y Subdivisions"].execute(), radius=self.inputs["Radius"].execute())
 class SuzanneNode(Node, ScInputNode):
     bl_idname = "SuzanneNode"
-    bl_label = "Suzanne (Monkey)"
+    bl_label = "Suzanne"
 
     prop_radius = FloatProperty(name="Radius", default=1.0, min=0.0, update=ScNode.update_value)
 
@@ -857,7 +857,7 @@ def functionality(self):
 # Modifiers
 class ArrayModNode(Node, ScModifierNode):
     bl_idname = "ArrayModNode"
-    bl_label = "Array Modifier"
+    bl_label = "Array"
 
     fit_type = EnumProperty(name="Fit Type", items=[("FIXED_COUNT", "Fixed Count", ""), ("FIT_LENGTH", "Fit Length", ""), ("FIT_CURVE", "Fit Curve", "")], default="FIXED_COUNT", update=ScNode.update_value)
     count = IntProperty(name="Count", default=2, min=1, max=1000, update=ScNode.update_value)
@@ -919,7 +919,7 @@ def post_execute(self):
         return super().post_execute()
 class BevelModNode(Node, ScModifierNode):
     bl_idname = "BevelModNode"
-    bl_label = "Bevel Modifier"
+    bl_label = "Bevel"
 
     width = FloatProperty(name="Width", default=0.1, min=0.0, update=ScNode.update_value)
     segments = IntProperty(name="Segments", default=1, min=0, max=100, update=ScNode.update_value)
@@ -965,7 +965,7 @@ def functionality(self):
         self.mesh.modifiers[0].offset_type = self.offset_type
 class BooleanModNode(Node, ScModifierNode):
     bl_idname = "BooleanModNode"
-    bl_label = "Boolean Modifier"
+    bl_label = "Boolean"
 
     prop_op = EnumProperty(name="Operation", items=[("DIFFERENCE", "Difference", ""), ("UNION", "Union", ""), ("INTERSECT", "Intersect", "")], default="INTERSECT", update=ScNode.update_value)
     prop_obj = PointerProperty(name="Object", type=bpy.types.Object)
@@ -999,7 +999,7 @@ def functionality(self):
         self.prop_obj.draw_type = self.prop_draw_mode
 class CastModNode(Node, ScModifierNode):
     bl_idname = "CastModNode"
-    bl_label = "Cast Modifier"
+    bl_label = "Cast"
 
     cast_type = EnumProperty(items=[("SPHERE", "Sphere", ""), ("CYLINDER", "Cylinder", ""), ("CUBOID", "Cuboid", "")], update=ScNode.update_value)
     use_x = BoolProperty(name="X", default=True, update=ScNode.update_value)
@@ -1051,7 +1051,7 @@ def post_execute(self):
         return super().post_execute()
 class CorrectiveSmoothModNode(Node, ScModifierNode):
     bl_idname = "CorrectiveSmoothModNode"
-    bl_label = "Corrective Smooth Modifier"
+    bl_label = "Corrective Smooth"
 
     factor = FloatProperty(default=0.5, soft_min=0.0, soft_max=1.0, update=ScNode.update_value)
     iterations = IntProperty(name="Repeat", default=5, min=-32768, max=32767, soft_min=0, soft_max=200, update=ScNode.update_value)
@@ -1089,7 +1089,7 @@ def functionality(self):
         self.mesh.modifiers[0].invert_vertex_group = self.invert_vertex_group
 class CurveModNode(Node, ScModifierNode):
     bl_idname = "CurveModNode"
-    bl_label = "Curve Modifier"
+    bl_label = "Curve"
 
     vertex_group = StringProperty(name="Vertex Group", update=ScNode.update_value)
     object = PointerProperty(type=bpy.types.Object, update=ScNode.update_value)
@@ -1117,7 +1117,7 @@ def functionality(self):
         self.mesh.modifiers[0].deform_axis = self.deform_axis
 class DecimateModNode(Node, ScModifierNode):
     bl_idname = "DecimateModNode"
-    bl_label = "Decimate Modifier"
+    bl_label = "Decimate"
 
     decimate_type = EnumProperty(items=[("COLLAPSE", "Collapse", ""), ("UNSUBDIV", "Un-Subdivide", ""), ("DISSOLVE", "Planar", "")], default="COLLAPSE", update=ScNode.update_value)
     vertex_group = StringProperty(update=ScNode.update_value)
@@ -1180,7 +1180,7 @@ def functionality(self):
         self.mesh.modifiers[0].delimit = self.delimit
 class DisplaceModNode(Node, ScModifierNode):
     bl_idname = "DisplaceModNode"
-    bl_label = "Displace Modifier"
+    bl_label = "Displace"
 
     texture = PointerProperty(type=bpy.types.Texture)
     direction = EnumProperty(items=[("X", "X", ""), ("Y", "Y", ""), ("Z", "Z", ""), ("NORMAL", "Normal", ""), ("CUSTOM_NORMAL", "Custom Normal", ""), ("RGB_TO_XYZ", "RGB to XYZ", "")], default="NORMAL", update=ScNode.update_value)
@@ -1236,7 +1236,7 @@ def functionality(self):
         self.mesh.modifiers[0].strength = self.inputs["Strength"].execute()
 class EdgeSplitModNode(Node, ScModifierNode):
     bl_idname = "EdgeSplitModNode"
-    bl_label = "Edge Split Modifier"
+    bl_label = "Edge Split"
 
     split_angle = FloatProperty(name="Sharpness", default=0.523599, min=0.0, max=3.14159, subtype="ANGLE", unit="ROTATION", update=ScNode.update_value)
     use_edge_angle = BoolProperty(default=True, update=ScNode.update_value)
@@ -1255,7 +1255,7 @@ def functionality(self):
         self.mesh.modifiers[0].use_edge_sharp = self.inputs["Sharp Edges"].execute()
 class LaplacianSmoothModNode(Node, ScModifierNode):
     bl_idname = "LaplacianSmoothModNode"
-    bl_label = "Laplacian Smooth Modifier"
+    bl_label = "Laplacian Smooth"
 
     iterations = IntProperty(name="Repeat", default=1, min=-32768, max=32767, soft_min=0, soft_max=200, update=ScNode.update_value)
     use_x = BoolProperty(name="X", default=True, update=ScNode.update_value)
@@ -1296,7 +1296,7 @@ def functionality(self):
         self.mesh.modifiers[0].vertex_group = self.vertex_group
 class MirrorModNode(Node, ScModifierNode):
     bl_idname = "MirrorModNode"
-    bl_label = "Mirror Modifier"
+    bl_label = "Mirror"
 
     use_x = BoolProperty(name="X", default=True, update=ScNode.update_value)
     use_y = BoolProperty(name="Y", update=ScNode.update_value)
@@ -1346,7 +1346,7 @@ def functionality(self):
         self.mesh.modifiers[0].mirror_object = self.mirror_object
 class RemeshModNode(Node, ScModifierNode):
     bl_idname = "RemeshModNode"
-    bl_label = "Remesh Modifier"
+    bl_label = "Remesh"
 
     mode = EnumProperty(name="Mode", items=[("BLOCKS", "Blocks", ""), ("SMOOTH", "Smooth", ""), ("SHARP", "Sharp", "")], default="SHARP", update=ScNode.update_value)
     octree_depth = IntProperty(name="Octree Depth", default=4, min=1, max=12, update=ScNode.update_value)
@@ -1379,7 +1379,7 @@ def functionality(self):
         self.mesh.modifiers[0].threshold = self.inputs["Threshold"].execute()
 class ScrewModNode(Node, ScModifierNode):
     bl_idname = "ScrewModNode"
-    bl_label = "Screw Modifier"
+    bl_label = "Screw"
 
     axis = EnumProperty(name="Axis", items=[("X", "X", ""), ("Y", "Y", ""), ("Z", "Z", "")], default="Z", update=ScNode.update_value)
     object = PointerProperty(type=bpy.types.Object, update=ScNode.update_value)
@@ -1440,7 +1440,7 @@ def post_execute(self):
         return super().post_execute()
 class SimpleDeformModNode(Node, ScModifierNode):
     bl_idname = "SimpleDeformModNode"
-    bl_label = "Simple Deform Modifier"
+    bl_label = "Simple Deform"
 
     vertex_group = StringProperty(name="Vertex Group", update=ScNode.update_value)
     deform_method = EnumProperty(items=[("TWIST", "Twist", ""), ("BEND", "Bend", ""), ("TAPER", "Taper", ""), ("STRETCH", "Stretch", "")], default="TWIST", update=ScNode.update_value)
@@ -1492,7 +1492,7 @@ def post_execute(self):
         return super().post_execute()
 class SkinModNode(Node, ScModifierNode):
     bl_idname = "SkinModNode"
-    bl_label = "Skin Modifier"
+    bl_label = "Skin"
 
     branch_smoothing = FloatProperty(name="Branch Smoothing", default=0.0, min=0.0, max=1.0, update=ScNode.update_value)
     use_smooth_shade = BoolProperty(name="Smooth Shading", update=ScNode.update_value)
@@ -1531,7 +1531,7 @@ def functionality(self):
         self.mesh.modifiers[0].use_z_symmetry = self.inputs["Z"].execute()
 class SmoothModNode(Node, ScModifierNode):
     bl_idname = "SmoothModNode"
-    bl_label = "Smooth Modifier"
+    bl_label = "Smooth"
 
     use_x = BoolProperty(name="X", default=True, update=ScNode.update_value)
     use_y = BoolProperty(name="Y", default=True, update=ScNode.update_value)
@@ -1562,7 +1562,7 @@ def functionality(self):
         self.mesh.modifiers[0].vertex_group = self.vertex_group
 class SolidifyModNode(Node, ScModifierNode):
     bl_idname = "SolidifyModNode"
-    bl_label = "Solidify Modifier"
+    bl_label = "Solidify"
 
     thickness = FloatProperty(name="Thickness", default=0.01, update=ScNode.update_value)
     thickness_clamp = FloatProperty(name="Clamp", default=0.0, min=0.0, max=100.0, update=ScNode.update_value)
@@ -1628,7 +1628,7 @@ def functionality(self):
         self.mesh.modifiers[0].material_offset_rim = self.inputs["Material Offset Rim"].execute()
 class SubdivideModNode(Node, ScModifierNode):
     bl_idname = "SubdivideModNode"
-    bl_label = "Subdivision Surface Modifier"
+    bl_label = "Subdivision Surface"
 
     subdivision_type = EnumProperty(items=[("CATMULL_CLARK", "Catmull-Clark", ""), ("SIMPLE", "Simple", "")], default="CATMULL_CLARK", update=ScNode.update_value)
     levels = IntProperty(default=1, min=0, max=11, soft_max=6, update=ScNode.update_value)
@@ -1662,7 +1662,7 @@ def functionality(self):
         self.mesh.modifiers[0].show_only_control_edges = self.inputs["Optimal Display"].execute()
 class TriangulateModNode(Node, ScModifierNode):
     bl_idname = "TriangulateModNode"
-    bl_label = "Triangulate Modifier"
+    bl_label = "Triangulate"
 
     quad_method = EnumProperty(items=[("BEAUTY", "Beauty", ""), ("FIXED", "Fixed", ""), ("FIXED_ALTERNATE", "Fixed Alternate", ""), ("SHORTEST_DIAGONAL", "Shortest Diagonal", "")], default="SHORTEST_DIAGONAL", update=ScNode.update_value)
     ngon_method = EnumProperty(items=[("BEAUTY", "Beauty", ""), ("CLIP", "Clip", "")], default="BEAUTY", update=ScNode.update_value)
@@ -1679,7 +1679,7 @@ def functionality(self):
         self.mesh.modifiers[0].ngon_method = self.ngon_method
 class WireframeModNode(Node, ScModifierNode):
     bl_idname = "WireframeModNode"
-    bl_label = "Wireframe Modifier"
+    bl_label = "Wireframe"
 
     thickness = FloatProperty(update=ScNode.update_value)
     vertex_group = StringProperty(update=ScNode.update_value)

diff --git a/icons/000_red_white_search.png b/icons/000_red_white_search.png
diff --git a/icons/001_red_white_inputs.png b/icons/001_red_white_inputs.png
diff --git a/icons/002_red_white_transform.png b/icons/002_red_white_transform.png
diff --git a/icons/003_red_white_conversion.png b/icons/003_red_white_conversion.png
diff --git a/icons/004_red_white_selection.png b/icons/004_red_white_selection.png
diff --git a/icons/005_red_white_deletion.png b/icons/005_red_white_deletion.png
diff --git a/icons/006_red_white_component operators.png b/icons/006_red_white_component operators.png
diff --git a/icons/007_red_white_mesh operators.png b/icons/007_red_white_mesh operators.png
diff --git a/icons/008_red_white_curve operators.png b/icons/008_red_white_curve operators.png
diff --git a/icons/009_red_white_modifiers.png b/icons/009_red_white_modifiers.png
diff --git a/icons/010_red_white_constants.png b/icons/010_red_white_constants.png
diff --git a/icons/011_red_white_utilities.png b/icons/011_red_white_utilities.png
diff --git a/icons/012_red_white_flow control.png b/icons/012_red_white_flow control.png
diff --git a/icons/013_red_white_settings.png b/icons/013_red_white_settings.png
diff --git a/icons/014_red_white_outputs.png b/icons/014_red_white_outputs.png
diff --git a/icons/100_red_black_search.png b/icons/100_red_black_search.png
diff --git a/icons/101_red_black_inputs.png b/icons/101_red_black_inputs.png
diff --git a/icons/102_red_black_transform.png b/icons/102_red_black_transform.png
diff --git a/icons/103_red_black_conversion.png b/icons/103_red_black_conversion.png
diff --git a/icons/104_red_black_selection.png b/icons/104_red_black_selection.png
diff --git a/icons/105_red_black_deletion.png b/icons/105_red_black_deletion.png
diff --git a/icons/106_red_black_component operators.png b/icons/106_red_black_component operators.png
diff --git a/icons/107_red_black_mesh operators.png b/icons/107_red_black_mesh operators.png
diff --git a/icons/108_red_black_curve operators.png b/icons/108_red_black_curve operators.png
diff --git a/icons/109_red_black_modifiers.png b/icons/109_red_black_modifiers.png
diff --git a/icons/110_red_black_constants.png b/icons/110_red_black_constants.png
diff --git a/icons/111_red_black_utilities.png b/icons/111_red_black_utilities.png
diff --git a/icons/112_red_black_flow control.png b/icons/112_red_black_flow control.png
diff --git a/icons/113_red_black_settings.png b/icons/113_red_black_settings.png
diff --git a/icons/114_red_black_outputs.png b/icons/114_red_black_outputs.png
diff --git a/icons/300_black_search.png b/icons/300_black_search.png
diff --git a/icons/301_black_inputs.png b/icons/301_black_inputs.png
diff --git a/icons/302_black_transform.png b/icons/302_black_transform.png
diff --git a/icons/303_black_conversion.png b/icons/303_black_conversion.png
diff --git a/icons/304_black_selection.png b/icons/304_black_selection.png
diff --git a/icons/305_black_deletion.png b/icons/305_black_deletion.png
diff --git a/icons/306_black_component operators.png b/icons/306_black_component operators.png
diff --git a/icons/307_black_mesh operators.png b/icons/307_black_mesh operators.png
diff --git a/icons/308_black_curve operators.png b/icons/308_black_curve operators.png
diff --git a/icons/309_black_modifiers.png b/icons/309_black_modifiers.png
diff --git a/icons/310_black_constants.png b/icons/310_black_constants.png
diff --git a/icons/311_black_utilities.png b/icons/311_black_utilities.png
diff --git a/icons/312_black_flow control.png b/icons/312_black_flow control.png
diff --git a/icons/313_black_settings.png b/icons/313_black_settings.png
diff --git a/icons/314_black_outputs.png b/icons/314_black_outputs.png
diff --git a/icons/400_white_search.png b/icons/400_white_search.png
diff --git a/icons/401_white_inputs.png b/icons/401_white_inputs.png
diff --git a/icons/402_white_transform.png b/icons/402_white_transform.png
diff --git a/icons/403_white_conversion.png b/icons/403_white_conversion.png
diff --git a/icons/404_white_selection.png b/icons/404_white_selection.png
diff --git a/icons/405_white_deletion.png b/icons/405_white_deletion.png
diff --git a/icons/406_white_component operators.png b/icons/406_white_component operators.png
diff --git a/icons/407_white_mesh operators.png b/icons/407_white_mesh operators.png
diff --git a/icons/408_white_curve operators.png b/icons/408_white_curve operators.png
diff --git a/icons/409_white_modifiers.png b/icons/409_white_modifiers.png
diff --git a/icons/410_white_constants.png b/icons/410_white_constants.png
diff --git a/icons/411_white_utilities.png b/icons/411_white_utilities.png
diff --git a/icons/412_white_flow control.png b/icons/412_white_flow control.png
diff --git a/icons/413_white_settings.png b/icons/413_white_settings.png
diff --git a/icons/414_white_outputs.png b/icons/414_white_outputs.png
diff --git a/icons/sorcar_icon.png b/icons/sorcar_icon.png