Skip to content

Release 2.7 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 2, 2016
Merged

Release 2.7 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3445f1a
Merge pull request #100 from MaximeHerpin/release-2.6
ekaj2 Sep 30, 2016
a68d808
Called mtree_props.objects instead of scene.objects
ekaj2 Oct 2, 2016
326bb83
Merge pull request #103 from MaximeHerpin/armature_bug
ekaj2 Oct 2, 2016
a388d70
Bumped version number
ekaj2 Oct 2, 2016
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
View file
Open in desktop
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, 6),
"version": (2, 7),
"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
View file
Open in desktop
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*6\)', re.DOTALL)
my_regex = re.compile(r'\"version\":\s*\(2,\s*7\)', 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
2 changes: 1 addition & 1 deletion tree_creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ def create_tree(position, is_twig=False):
bpy.ops.object.select_all(action='DESELECT')
obj.select = True
arm.select = True
mtree_props.objects.active = arm
scene.objects.active = arm
bpy.ops.object.parent_set(type='ARMATURE_AUTO')
bpy.ops.object.select_all(action='DESELECT')
clock.stop("armature")
Expand Down