Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
bl_info = {
"name": "Modular trees",
"author": "Herpin Maxime, Jake Dube",
"version": (2, 5),
"version": (2, 6),
"blender": (2, 77, 0),
"location": "View3D > Tools > Tree > Make Tree",
"description": "Generates an organic tree with correctly modeled branching.",
Expand Down
2 changes: 1 addition & 1 deletion check_for_updates.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def execute(self, context):
page = parser.get_results()

# "version ": (n, n )
my_regex = re.compile(r'\"version\":\s*\(2,\s*5\)', re.DOTALL)
my_regex = re.compile(r'\"version\":\s*\(2,\s*6\)', re.DOTALL)
# check if version number is on page
if re.search(my_regex, page):
self.report({'ERROR'}, "You have the latest official release.")
Expand Down
3 changes: 2 additions & 1 deletion generator_operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ def execute(self, context):
mtree_props.bones_iterations = 10
mtree_props.visualize_leafs = False
mtree_props.leafs_iteration_length = 7
mtree_props.uv = True
mtree_props.mat = mtree_props.mat
mtree_props.roots_iteration = 0
mtree_props.create_roots = False
Expand All @@ -189,6 +188,7 @@ def execute(self, context):
build_leaf_material("twig leaf")

twig_leafs = create_tree(scene.cursor_location, is_twig=True)

twig = bpy.context.active_object
twig.name = 'twig'
twig.active_material = bpy.data.materials.get(mtree_props.twig_bark_material)
Expand All @@ -200,6 +200,7 @@ def execute(self, context):
bpy.context.active_object.active_material = bpy.data.materials.get(mtree_props.twig_leaf_material)
twig.select = True
scene.objects.active = twig

bpy.ops.object.join()
bpy.ops.transform.rotate(value=-1.5708, axis=(1, 0, 0))
bpy.ops.transform.resize(value=(0.25, 0.25, 0.25))
Expand Down
1 change: 1 addition & 0 deletions tree_creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@ def create_tree(position, is_twig=False):
mesh.vertices[i].select = True
bpy.ops.object.mode_set(mode='EDIT')
if mtree_props.finish_unwrap:
bpy.context.tool_settings.mesh_select_mode = (True, False, False)
bpy.ops.uv.unwrap(method='ANGLE_BASED', margin=0.001)
rotate() # this will set the mode to object already
else:
Expand Down
2 changes: 1 addition & 1 deletion uv_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


def rotate():
"""After automatic unwrap, the uv islands are not corectly oriented, this function corrects it by rotating them acordingly"""
"""After automatic unwrap, the uv islands are not correctly oriented, this function corrects it by rotating them accordingly."""
bpy.ops.object.mode_set(mode='EDIT')
make_islands = MakeIslands()
bm = make_islands.get_bm()
Expand Down