Skip to content

Commit

Permalink
Merge branch '504-remove-scene-main-camera-from-synchronization' into…
Browse files Browse the repository at this point in the history
… 'master'

Resolve "Remove scene main camera from synchronization"

Closes #504

See merge request animation-studio/blender/mixer!257
  • Loading branch information
jatubi committed Apr 7, 2021
2 parents 12dd556 + ad999c0 commit 4b3d9bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Features

- Synchronization: ignore scene camera
- UI: add a prefix to default room name based on user name
- UI: add the list of users per room in the Selected Room Properties panel
- UI: improved visibility of Connect and Disconnect buttons for existing rooms
Expand Down
2 changes: 2 additions & 0 deletions mixer/blender_data/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,8 @@ def unhandled_bpy_data_collection_names(self) -> List[str]:
T.Scene: [
NameFilterOut(
[
# each user should be able to view and render through the scene camera she chooses
"camera",
# Let each participant play his own time
"frame_current",
"frame_float",
Expand Down

0 comments on commit 4b3d9bc

Please sign in to comment.