Skip to content

Commit

Permalink
Merge branch '216-bug-fixes' into 'main'
Browse files Browse the repository at this point in the history
Resolve "Bug fixes"

Closes #216

See merge request blender/public-projects/shotmanager-addon!123
  • Loading branch information
jatubi committed Feb 27, 2023
2 parents f77b79c + e4658cb commit 28b0115
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 2 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-----
## 2.1.46 (2023-02-27)
- Fixed a crash when duplicating a shot

-----
## 2.1.45 (2023-01-10)
- Released beta version for testing

-----
## 2.1.44 (2023-01-09)
- Fixed a bug in Camera HUD file due to missing config import

-----
## 2.1.43 (2022-11-14)
- Fixed internet connection pooling on Linux
Expand Down
2 changes: 1 addition & 1 deletion shotmanager/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"author": "Ubisoft - Julien Blervaque (aka Werwack), Romain Carriquiry Borchiari",
"description": "Easily manage shots and cameras in the 3D View and see the resulting edit in real-time",
"blender": (3, 3, 0),
"version": (2, 1, 43),
"version": (2, 1, 46),
"location": "View3D > Shot Mng",
"doc_url": "https://ubisoft-shotmanager.readthedocs.io",
"tracker_url": "https://github.com/ubisoft/shotmanager/issues",
Expand Down
1 change: 1 addition & 0 deletions shotmanager/operators/shots_global_settings_operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from bpy.props import BoolProperty

from shotmanager.utils import utils_greasepencil
from shotmanager.config import config


#####################################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import bpy
from bpy.app.handlers import persistent

from shotmanager.config import config


@persistent
def shotMngHandler_load_post_cameraHUD(self, context):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import bpy
from bpy.types import Operator

from shotmanager.config import config


class UAS_ShotManager_CameraHUD_ToggleDisplay(Operator):
bl_idname = "uas_shot_manager.camerahud_toggle_display"
Expand Down
2 changes: 2 additions & 0 deletions shotmanager/scripts/rrs/operators_rrs.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from bpy.types import Operator
from bpy.props import BoolProperty, StringProperty, IntProperty

from shotmanager.config import config

from . import publish_rrs

# To call the operator:
Expand Down
1 change: 1 addition & 0 deletions shotmanager/ui/dependencies_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import bpy

# from ..utils import utils
from shotmanager.config import config

# import platform

Expand Down
3 changes: 2 additions & 1 deletion shotmanager/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,8 @@ def duplicateObject(sourceObject, newName=None, duplicateHierarchy=False):
def _duplicateObjectRec(sourceObject, sourceParent, dupHierarchy):

newObject = sourceObject.copy()
if newObject.animation_data is not None:

if sourceObject.animation_data is not None and sourceObject.animation_data.action is not None:
newObject.animation_data.action = sourceObject.animation_data.action.copy()

# empty objects don't have data
Expand Down

0 comments on commit 28b0115

Please sign in to comment.