Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2020-08-18 13:15:46 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2020-08-18 15:28:59 +0300
commit1da0685076bbddaaa9eb20366f07b5d552f03eb4 (patch)
tree2729556dcaf38ac0cfa4359c777ac098f668afa8 /intern/cycles/blender/blender_sync.cpp
parent673b1930d85bb9759a1297fa3d354f216dcd98da (diff)
Cycles: add a Pass Node
The Pass struct is now a Node and the passes are moved from the Film class to the Scene class. The Pass Node only has `type` and `name` as sockets as those seem to be the only properties settable by exporters (other properties are implicit and depend on the pass type). This is part of T79131. Reviewed By: brecht Differential Revision: https://developer.blender.org/D8591
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r--intern/cycles/blender/blender_sync.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 511061db08a..f0b5ab087bb 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -372,8 +372,10 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
Film *film = scene->film;
Film prevfilm = *film;
+ vector<Pass> prevpasses = scene->passes;
+
if (b_v3d) {
- film->display_pass = update_viewport_display_passes(b_v3d, film->passes);
+ film->display_pass = update_viewport_display_passes(b_v3d, scene->passes);
}
film->exposure = get_float(cscene, "film_exposure");
@@ -403,7 +405,11 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
if (film->modified(prevfilm)) {
film->tag_update(scene);
- film->tag_passes_update(scene, prevfilm.passes, false);
+ }
+
+ if (!Pass::equals(prevpasses, scene->passes)) {
+ film->tag_passes_update(scene, prevpasses, false);
+ film->tag_update(scene);
}
}