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

fix(rcf): client drawing code

Browse Source
This commit is contained in:
Swann Martinez
2019-04-02 14:42:39 +02:00
parent 3461714372
commit adc8a79ae6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net_operators.py
View File

@ -151,7 +151,7 @@ def upload_client_position():
key = "net/clients/{}".format(client.id.decode()) key = "net/clients/{}".format(client.id.decode())
try: try:
current_coords = get_client_view_rect() current_coords = net_draw.get_client_view_rect()
data = client.property_map[key].body data = client.property_map[key].body
if data is None: if data is None:
data = {} data = {}
@ -306,11 +306,13 @@ def load_scene(target=None, data=None, create=False):
target.collection.children.link( target.collection.children.link(
bpy.data.collections[collection]) bpy.data.collections[collection])
# Load annotation
if data["grease_pencil"]: if data["grease_pencil"]:
target.grease_pencil = bpy.data.grease_pencils[data["grease_pencil"]] target.grease_pencil = bpy.data.grease_pencils[data["grease_pencil"]["name"]]
except: except:
print("Collection loading error") print("Collection loading error")
def load_material(target=None, data=None, create=False): def load_material(target=None, data=None, create=False):
try: try:
if target is None and create: if target is None and create:
@ -356,6 +358,7 @@ def load_material(target=None, data=None, create=False):
except: except:
print("Material loading error") print("Material loading error")
def load_gpencil_layer(target=None,data=None, create=False): def load_gpencil_layer(target=None,data=None, create=False):
dump_anything.load(target, data) dump_anything.load(target, data)
@ -737,7 +740,7 @@ class session_snapview(bpy.types.Operator):
def execute(self, context): def execute(self, context):
global client global client
area, region, rv3d = view3d_find() area, region, rv3d = net_draw.view3d_find()
for k, v in client.property_map.items(): for k, v in client.property_map.items():
if v.mtype == 'client' and v.id.decode() == self.target_client: if v.mtype == 'client' and v.id.decode() == self.target_client: