From 378f52a1abb5c988d6d90ecd616db2f5f90fac21 Mon Sep 17 00:00:00 2001
From: Swann <swann.martinez@protonmail.com>
Date: Sat, 8 Feb 2020 23:23:00 +0100
Subject: [PATCH] fix: mesh uv loading issue refacotr: loading status refactor:
 cleanup logs

---
 multi_user/bl_types/bl_datablock.py |  2 --
 multi_user/bl_types/bl_mesh.py      | 10 ++++++----
 multi_user/libs/replication         |  2 +-
 multi_user/ui.py                    |  9 +++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py
index f54cbb4..a39558e 100644
--- a/multi_user/bl_types/bl_datablock.py
+++ b/multi_user/bl_types/bl_datablock.py
@@ -80,8 +80,6 @@ class BlDatablock(ReplicatedDatablock):
 
         if self.pointer and hasattr(self.pointer, 'uuid'):
             self.pointer.uuid = self.uuid
-        
-        self.diff_method = DIFF_BINARY
 
     def library_apply(self):
         """Apply stored data
diff --git a/multi_user/bl_types/bl_mesh.py b/multi_user/bl_types/bl_mesh.py
index e6ca629..888ba31 100644
--- a/multi_user/bl_types/bl_mesh.py
+++ b/multi_user/bl_types/bl_mesh.py
@@ -3,7 +3,7 @@ import bmesh
 import mathutils
 
 from .. import utils
-
+from ..libs.replication.replication.constants import DIFF_BINARY
 from .bl_datablock import BlDatablock
 
 def dump_mesh(mesh, data={}):
@@ -85,7 +85,7 @@ class BlMesh(BlDatablock):
     bl_icon = 'MESH_DATA'    
 
     def construct(self, data):
-        
+        self.diff_method = DIFF_BINARY
         instance = bpy.data.meshes.new(data["name"])
         instance.uuid = self.uuid
         return instance
@@ -136,8 +136,10 @@ class BlMesh(BlDatablock):
 
             # 3 - LOAD METADATA
             # uv's
-            for uv_layer in data['uv_layers']:
-                target.uv_layers.new(name=uv_layer)
+            # target.uv_layers.clear()
+            utils.dump_anything.load(target.uv_layers, data['uv_layers'])
+            # for uv_layer in data['uv_layers']:
+            #     target.uv_layers.new(name=uv_layer)
     
             bevel_layer = mesh_buffer.verts.layers.bevel_weight.verify()
             skin_layer = mesh_buffer.verts.layers.skin.verify()
diff --git a/multi_user/libs/replication b/multi_user/libs/replication
index 425d2c1..226ca7c 160000
--- a/multi_user/libs/replication
+++ b/multi_user/libs/replication
@@ -1 +1 @@
-Subproject commit 425d2c13824945dacb2f88d5fbfe51950565abf5
+Subproject commit 226ca7cd8a343ef9e566fca4bda4a51f3b50a82f
diff --git a/multi_user/ui.py b/multi_user/ui.py
index 3296e89..e7009d0 100644
--- a/multi_user/ui.py
+++ b/multi_user/ui.py
@@ -18,9 +18,9 @@ ICONS_PROP_STATES = ['TRIA_DOWN',  # ADDED
 def get_state_str(state):
     state_str = 'None'
     if state == STATE_WAITING:
-        state_str = 'COMMITING DATA'
+        state_str = 'WRMING UP DATA'
     elif state == STATE_SYNCING:
-        state_str = 'SYNCING'
+        state_str = 'FETCHING FROM SERVER'
     elif state == STATE_AUTH:
         state_str = 'AUTHENTIFICATION'
     elif state == STATE_CONFIG:
@@ -28,7 +28,7 @@ def get_state_str(state):
     elif state == STATE_ACTIVE:
         state_str = 'ACTIVE'
     elif state == STATE_SRV_SYNC:
-        state_str = 'SERVER SYNC'
+        state_str = 'PUSHING TO SERVER'
     return state_str
 
 class SESSION_PT_settings(bpy.types.Panel):
@@ -274,7 +274,8 @@ class SESSION_PT_presence(bpy.types.Panel):
 
     @classmethod
     def poll(cls, context):
-        return True
+        return not operators.client \
+            or (operators.client and operators.client.state['STATE'] in [STATE_INITIAL, STATE_ACTIVE])
 
     def draw_header(self, context):
         self.layout.prop(context.window_manager.session, "enable_presence", text="")