Compare commits
3 Commits
248-object
...
246-bevel-
Author | SHA1 | Date | |
---|---|---|---|
5a2ec0c328 | |||
cc5ceafea9 | |||
b1464c9e14 |
30
CHANGELOG.md
30
CHANGELOG.md
@ -217,33 +217,3 @@ All notable changes to this project will be documented in this file.
|
|||||||
- GPencil fill stroke
|
- GPencil fill stroke
|
||||||
- Sculpt and GPencil brushes deleted when joining a session (@Kysios)
|
- Sculpt and GPencil brushes deleted when joining a session (@Kysios)
|
||||||
- Auto-updater doesn't work for master and develop builds
|
- Auto-updater doesn't work for master and develop builds
|
||||||
|
|
||||||
## [0.5.0] - 2022-02-10
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- New overall UI and UX (@Kysios)
|
|
||||||
- Documentation overall update (@Kysios)
|
|
||||||
- Server presets (@Kysios)
|
|
||||||
- Server online status (@Kysios)
|
|
||||||
- Draw connected user color in the user list
|
|
||||||
- Private session (access protected with a password) (@Kysios)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- Dependencies are now installed in the addon folder and correctly cleaned during the addon removal process
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Python 3.10 compatibility (@notfood)
|
|
||||||
- Blender 3.x compatibility
|
|
||||||
- Skin vertex radius synchronization (@kromar)
|
|
||||||
- Sequencer audio strip synchronization
|
|
||||||
- Crash with empty after a reconnection
|
|
||||||
|
|
||||||
## [0.5.1] - 2022-02-10
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- Auto updater breaks dependency auto installer
|
|
||||||
- Auto updater update from tag
|
|
@ -206,9 +206,9 @@ You can run the dedicated server on any platform by following these steps:
|
|||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
python -m pip install replication
|
python -m pip install replication==0.1.13
|
||||||
|
|
||||||
3. Launch the server with:
|
4. Launch the server with:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
@ -562,7 +562,7 @@ The default Docker image essentially runs the equivalent of:
|
|||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
replication.server -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
|
replication.serve -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
|
||||||
|
|
||||||
This means the server will be launched with 'admin' as the administrator password, run on ports 5555:5558, use a timeout of 5 seconds, verbose 'DEBUG' log level, and with log files written to 'multiuser_server.log'. See :ref:`cmd-line` for a description of optional parameters.
|
This means the server will be launched with 'admin' as the administrator password, run on ports 5555:5558, use a timeout of 5 seconds, verbose 'DEBUG' log level, and with log files written to 'multiuser_server.log'. See :ref:`cmd-line` for a description of optional parameters.
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
bl_info = {
|
bl_info = {
|
||||||
"name": "Multi-User",
|
"name": "Multi-User",
|
||||||
"author": "Swann Martinez",
|
"author": "Swann Martinez",
|
||||||
"version": (0, 5, 2),
|
"version": (0, 4, 1),
|
||||||
"description": "Enable real-time collaborative workflow inside blender",
|
"description": "Enable real-time collaborative workflow inside blender",
|
||||||
"blender": (2, 82, 0),
|
"blender": (2, 82, 0),
|
||||||
"location": "3D View > Sidebar > Multi-User tab",
|
"location": "3D View > Sidebar > Multi-User tab",
|
||||||
|
@ -1015,18 +1015,16 @@ class Singleton_updater(object):
|
|||||||
for path, dirs, files in os.walk(base):
|
for path, dirs, files in os.walk(base):
|
||||||
# prune ie skip updater folder
|
# prune ie skip updater folder
|
||||||
dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
|
dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
|
||||||
|
|
||||||
for directory in dirs:
|
|
||||||
shutil.rmtree(os.path.join(path,directory))
|
|
||||||
|
|
||||||
for file in files:
|
for file in files:
|
||||||
try:
|
for ptrn in self.remove_pre_update_patterns:
|
||||||
fl = os.path.join(path,file)
|
if fnmatch.filter([file],ptrn):
|
||||||
os.remove(fl)
|
try:
|
||||||
if self._verbose: print("Pre-removed file "+file)
|
fl = os.path.join(path,file)
|
||||||
except OSError:
|
os.remove(fl)
|
||||||
print("Failed to pre-remove "+file)
|
if self._verbose: print("Pre-removed file "+file)
|
||||||
self.print_trace()
|
except OSError:
|
||||||
|
print("Failed to pre-remove "+file)
|
||||||
|
self.print_trace()
|
||||||
|
|
||||||
# Walk through the temp addon sub folder for replacements
|
# Walk through the temp addon sub folder for replacements
|
||||||
# this implements the overwrite rules, which apply after
|
# this implements the overwrite rules, which apply after
|
||||||
@ -1703,7 +1701,7 @@ class GitlabEngine(object):
|
|||||||
def parse_tags(self, response, updater):
|
def parse_tags(self, response, updater):
|
||||||
if response == None:
|
if response == None:
|
||||||
return []
|
return []
|
||||||
return [{"name": tag["name"], "zipball_url": f"https://gitlab.com/slumber/multi-user/-/jobs/artifacts/{tag['name']}/download?job=build"} for tag in response]
|
return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["commit"]["id"], updater)} for tag in response]
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
@ -267,7 +267,7 @@ class addon_updater_update_now(bpy.types.Operator):
|
|||||||
clean_install: bpy.props.BoolProperty(
|
clean_install: bpy.props.BoolProperty(
|
||||||
name="Clean install",
|
name="Clean install",
|
||||||
description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
|
description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
|
||||||
default=True,
|
default=False,
|
||||||
options={'HIDDEN'}
|
options={'HIDDEN'}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -47,7 +47,10 @@ SHAPEKEY_BLOCK_ATTR = [
|
|||||||
'slider_max',
|
'slider_max',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
CURVE_POINT = [
|
||||||
|
'location',
|
||||||
|
'handle_type_2',
|
||||||
|
]
|
||||||
if bpy.app.version >= (2,93,0):
|
if bpy.app.version >= (2,93,0):
|
||||||
SUPPORTED_GEOMETRY_NODE_PARAMETERS = (int, str, float)
|
SUPPORTED_GEOMETRY_NODE_PARAMETERS = (int, str, float)
|
||||||
else:
|
else:
|
||||||
@ -418,7 +421,8 @@ def dump_modifiers(modifiers: bpy.types.bpy_prop_collection)->dict:
|
|||||||
dumped_modifier['settings'] = dumper.dump(modifier.settings)
|
dumped_modifier['settings'] = dumper.dump(modifier.settings)
|
||||||
elif modifier.type == 'UV_PROJECT':
|
elif modifier.type == 'UV_PROJECT':
|
||||||
dumped_modifier['projectors'] =[p.object.name for p in modifier.projectors if p and p.object]
|
dumped_modifier['projectors'] =[p.object.name for p in modifier.projectors if p and p.object]
|
||||||
|
elif modifier.type == 'BEVEL' and modifier.profile_type == 'CUSTOM':
|
||||||
|
dumped_modifier['custom_profile'] = np_dump_collection(modifier.custom_profile.points, CURVE_POINT)
|
||||||
dumped_modifiers.append(dumped_modifier)
|
dumped_modifiers.append(dumped_modifier)
|
||||||
return dumped_modifiers
|
return dumped_modifiers
|
||||||
|
|
||||||
@ -490,11 +494,31 @@ def load_modifiers(dumped_modifiers: list, modifiers: bpy.types.bpy_prop_collect
|
|||||||
loaded_modifier.projectors[projector_index].object = target_object
|
loaded_modifier.projectors[projector_index].object = target_object
|
||||||
else:
|
else:
|
||||||
logging.error("Could't load projector target object {projector_object}")
|
logging.error("Could't load projector target object {projector_object}")
|
||||||
|
elif loaded_modifier.type == 'BEVEL':
|
||||||
|
src_cust_profile = dumped_modifier.get('custom_profile')
|
||||||
|
if src_cust_profile:
|
||||||
|
dst_points = loaded_modifier.custom_profile.points
|
||||||
|
|
||||||
|
# TODO: refactor to be diff-compatible
|
||||||
|
for p in dst_points:
|
||||||
|
try:
|
||||||
|
dst_points.remove(dst_points[0])
|
||||||
|
except Exception:
|
||||||
|
break
|
||||||
|
|
||||||
|
for i in range(len(src_cust_profile['handle_type_2'])-len(dst_points)):
|
||||||
|
dst_points.add(0,0)
|
||||||
|
|
||||||
|
|
||||||
|
np_load_collection(src_cust_profile, dst_points, CURVE_POINT)
|
||||||
|
|
||||||
|
loaded_modifier.custom_profile.points.update()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def load_modifiers_custom_data(dumped_modifiers: dict, modifiers: bpy.types.bpy_prop_collection):
|
def load_modifiers_custom_data(dumped_modifiers: dict, modifiers: bpy.types.bpy_prop_collection):
|
||||||
""" Load modifiers custom data not managed by the dump_anything loader
|
""" Load modifiers custom data not managed by the dump_anything loader
|
||||||
|
git
|
||||||
:param dumped_modifiers: modifiers to load
|
:param dumped_modifiers: modifiers to load
|
||||||
:type dumped_modifiers: dict
|
:type dumped_modifiers: dict
|
||||||
:param modifiers: target modifiers collection
|
:param modifiers: target modifiers collection
|
||||||
|
@ -581,6 +581,7 @@ class Loader:
|
|||||||
else:
|
else:
|
||||||
dst_curve.points.new(pos[0], pos[1])
|
dst_curve.points.new(pos[0], pos[1])
|
||||||
curves.update()
|
curves.update()
|
||||||
|
|
||||||
|
|
||||||
def _load_pointer(self, instance, dump):
|
def _load_pointer(self, instance, dump):
|
||||||
rna_property_type = instance.bl_rna_property.fixed_type
|
rna_property_type = instance.bl_rna_property.fixed_type
|
||||||
|
Submodule multi_user/libs/replication updated: b3cee9e744...029e12b2be
@ -1036,7 +1036,7 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
|
|||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
class SESSION_PT_ImportUser(bpy.types.Panel):
|
class SessionImportUser(bpy.types.Panel):
|
||||||
bl_space_type = 'FILE_BROWSER'
|
bl_space_type = 'FILE_BROWSER'
|
||||||
bl_region_type = 'TOOL_PROPS'
|
bl_region_type = 'TOOL_PROPS'
|
||||||
bl_label = "Users"
|
bl_label = "Users"
|
||||||
@ -1300,7 +1300,7 @@ classes = (
|
|||||||
SessionNotifyOperator,
|
SessionNotifyOperator,
|
||||||
SessionSaveBackupOperator,
|
SessionSaveBackupOperator,
|
||||||
SessionLoadSaveOperator,
|
SessionLoadSaveOperator,
|
||||||
SESSION_PT_ImportUser,
|
SessionImportUser,
|
||||||
SessionStopAutoSaveOperator,
|
SessionStopAutoSaveOperator,
|
||||||
SessionPurgeOperator,
|
SessionPurgeOperator,
|
||||||
SessionPresetServerAdd,
|
SessionPresetServerAdd,
|
||||||
|
Reference in New Issue
Block a user