Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: collection instances index offset

Browse Source
This commit is contained in:
Swann 2021-07-13 16:33:46 +02:00
parent 781287c390
commit 1e675132d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multi_user/presence.py
View File

@ -337,9 +337,9 @@ class UserSelectionWidget(Widget):
@property @property
def selected_objects(self): def selected_objects(self):
user_selection = self.data.get('selected_objects') user_selection = self.data.get('selected_objects')
if user_selection != self.current_selection_ids: if self.current_selection_ids != user_selection:
self.current_selection_ids = user_selection
self.current_selected_objects = [find_from_attr("uuid", uid, bpy.data.objects) for uid in user_selection] self.current_selected_objects = [find_from_attr("uuid", uid, bpy.data.objects) for uid in user_selection]
self.current_selection_ids = user_selection
return self.current_selected_objects return self.current_selected_objects
@ -361,11 +361,12 @@ class UserSelectionWidget(Widget):
vertex_ind = [] vertex_ind = []
collection_offset = 0 collection_offset = 0
for obj_index, obj in enumerate(self.selected_objects): for obj_index, obj in enumerate(self.selected_objects):
if obj is None:
continue
obj_index+=collection_offset obj_index+=collection_offset
logging.info(collection_offset)
if hasattr(obj, 'instance_collection') and obj.instance_collection: if hasattr(obj, 'instance_collection') and obj.instance_collection:
bbox_pos, bbox_ind = bbox_from_instance_collection(obj, index=obj_index) bbox_pos, bbox_ind = bbox_from_instance_collection(obj, index=obj_index)
collection_offset+=len(obj.instance_collection.objects) collection_offset+=len(obj.instance_collection.objects)-1
else : else :
bbox_pos, bbox_ind = bbox_from_obj(obj, index=obj_index) bbox_pos, bbox_ind = bbox_from_obj(obj, index=obj_index)
vertex_pos += bbox_pos vertex_pos += bbox_pos