Skip to content

Commit b82fbd3

Browse files
author
Arnaud Degroote
committed
Do not test again for blender version < 2.65
1 parent d17d20c commit b82fbd3

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

src/morse/builder/bpymorse.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ def empty_method(*args, **kwargs):
6969
link_append = bpy.ops.wm.link_append
7070
collada_import = bpy.ops.wm.collada_import
7171
add_object = bpy.ops.object.add
72-
if bpy.app.version >= (2, 65, 0):
73-
add_empty = bpy.ops.object.empty_add
72+
add_empty = bpy.ops.object.empty_add
7473
new_mesh = bpy.data.meshes.new
7574
new_object = bpy.data.objects.new
7675
apply_transform = bpy.ops.object.transform_apply
@@ -94,10 +93,7 @@ def create_new_material():
9493

9594
def add_morse_empty(shape = 'ARROWS'):
9695
"""Add MORSE Component Empty object which hlods MORSE logic"""
97-
if bpy.app.version >= (2, 65, 0):
98-
add_empty(type = shape)
99-
else:
100-
add_object(type='EMPTY')
96+
add_empty(type = shape)
10197

10298
def deselect_all():
10399
select_all(action='DESELECT')

src/morse/sensors/camera.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,25 +172,13 @@ def _setup_video_texture(self):
172172
known_ids = set()
173173
for obj in self._scene.objects:
174174
if obj.name != '__default__cam__' and id(obj) not in known_ids:
175-
if blenderapi.version() < (2, 63, 0):
176-
members = None
177-
elif blenderapi.version() < (2, 64, 0):
178-
members = obj.group
179-
elif blenderapi.version() < (2, 65, 0):
180-
members = obj.group_parent
181-
else:
182-
members = obj.groupMembers
175+
members = obj.groupMembers
183176
if not members:
184177
self._scene_syncable_objects.append(
185178
(obj, self._morse_scene.objects[obj.name]))
186179
known_ids.add(id(obj))
187180
else:
188-
if blenderapi.version() < (2, 64, 0):
189-
main_members = self._morse_scene.objects[obj.name].group
190-
elif blenderapi.version() < (2, 65, 0):
191-
main_members = self._morse_scene.objects[obj.name].group_parent
192-
else:
193-
main_members = self._morse_scene.objects[obj.name].groupMembers
181+
main_members = self._morse_scene.objects[obj.name].groupMembers
194182
for i in range(0, len(main_members)):
195183
self._scene_syncable_objects.append(
196184
(members[i], main_members[i]))

0 commit comments

Comments
 (0)