Skip to content

Commit

Permalink
Merge branch '498-remove-transformation-settings-from-synchronisation…
Browse files Browse the repository at this point in the history
…' into 'master'

Resolve "Remove Transformation settings from synchronisation"

Closes #498

See merge request animation-studio/blender/mixer!247
  • Loading branch information
jatubi committed Mar 16, 2021
2 parents bd168cf + 20f2a15 commit ea33e79
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,7 @@ $RECYCLE.BIN/
gitlab/blender
logs/
*.blend1

# Docs
docs/_build
docs/_html
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Object modifier synchronization failure on Blender 2.92
- VSE synchronization error on 2.92
- Invalid values for user color
- Removed synchronisation for 3D Cursor, viewport transform modes and snapping, render engine

## CI

Expand Down
8 changes: 8 additions & 0 deletions mixer/blender_data/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ def unhandled_bpy_data_collection_names(self) -> List[str]:
"stereo_views",
# Causes error in pass_filter, maybe not useful
"bake",
# Engine type (Eevee, Cycle...)
"engine",
]
)
],
Expand All @@ -550,6 +552,12 @@ def unhandled_bpy_data_collection_names(self) -> List[str]:
# TODO
# a view into builtin U keying_sets ?
"keying_sets_all",
# ui: scene transform mode
"transform_orientation_slots",
# ui: user settings for viewport content manipulation
"tool_settings",
# ui: 3D cursor
"cursor",
]
),
],
Expand Down
Binary file modified mixer/blender_data/tests/test_data.blend
Binary file not shown.

0 comments on commit ea33e79

Please sign in to comment.