Skip to content

Commit

Permalink
Merge pull request #115 from MaximeHerpin/revert-114-icons
Browse files Browse the repository at this point in the history
Revert "Icons"
  • Loading branch information
ekaj2 authored Oct 12, 2016
2 parents d22befb + 7ad0210 commit dacd49e
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 56 deletions.
15 changes: 5 additions & 10 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from .logo import display_logo
from .wind_setup_utils import WindOperator, MakeControllerOperator, MakeTerrainOperator
from .addon_name import save_addon_name
from .icons import register_icons, unregister_icons, get_icon

# third party add-on updater
from . import addon_updater_ops
Expand Down Expand Up @@ -143,11 +142,11 @@ def draw(self, context):

row = layout.row()
row.scale_y = 1.5
row.operator("mod_tree.add_tree", icon_value=get_icon("TREE"))
row.operator("mod_tree.add_tree", icon="WORLD")

row = layout.row()
row.scale_y = 1.5
row.operator("mod_tree.update_tree", icon_value=get_icon("TREE_UPDATE"))
row.operator("mod_tree.update_tree", icon="FILE_REFRESH")

box = layout.box()
box.label("Basic")
Expand Down Expand Up @@ -177,7 +176,7 @@ def draw(self, context):
layout = self.layout
row = layout.row()
row.scale_y = 1.5
row.operator("mod_tree.batch_tree", icon_value=get_icon("BATCH_TREE"))
row.operator("mod_tree.batch_tree", icon="LOGIC")
box = layout.box()
box.prop(mtree_props, "tree_number")
box.prop(mtree_props, "batch_radius_randomness")
Expand Down Expand Up @@ -298,7 +297,7 @@ def draw(self, context):
box = layout.box()
row = box.row()
row.scale_y = 1.5
row.operator("mod_tree.animate_wind", icon="FORCE_WIND")
row.operator("mod_tree.animate_wind", icon="FORCE_VORTEX")
box.operator("mod_tree.make_wind_controller", icon="FORCE_VORTEX")
box.operator("mod_tree.make_terrain", icon="FORCE_VORTEX")
box.prop_search(mtree_props, "wind_controller", bpy.data, "objects")
Expand All @@ -324,7 +323,7 @@ def draw(self, context):

row = layout.row()
row.scale_y = 1.5
row.operator("mod_tree.add_twig", icon_value=get_icon('TWIG'))
row.operator("mod_tree.add_twig", icon="SCULPTMODE_HLT")

row = layout.row()
row.scale_y = 1.5
Expand Down Expand Up @@ -725,8 +724,6 @@ def doc_map():


def register():
register_icons()

save_addon_name(__name__)

addon_updater_ops.register(bl_info)
Expand All @@ -743,8 +740,6 @@ def register():


def unregister():
unregister_icons()

addon_updater_ops.unregister()

# unregister all classes
Expand Down
Binary file removed custom_icons/BATCH_TREE.png
Binary file not shown.
Binary file removed custom_icons/TREE.png
Binary file not shown.
Binary file removed custom_icons/TREE1.png
Binary file not shown.
Binary file removed custom_icons/TREE_UPDATE.png
Binary file not shown.
Binary file removed custom_icons/TWIG.png
Binary file not shown.
46 changes: 0 additions & 46 deletions icons.py

This file was deleted.

0 comments on commit dacd49e

Please sign in to comment.