griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Sergey Sharybin
2023-11-03 15:41:29 +01:00
parent e3d4db5ded e623d07362
commit 27faf83fff
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/depsgraph/intern/builder/deg_builder_relations.h
View File

@@ -125,6 +125,7 @@ class DepsgraphRelationBuilder : public DepsgraphBuilder {
virtual void build_idproperties(IDProperty *id_property);
virtual void build_scene_camera(Scene *scene);
virtual void build_scene_render(Scene *scene, ViewLayer *view_layer);
virtual void build_scene_parameters(Scene *scene);
virtual void build_scene_compositor(Scene *scene);

12
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
View File

@@ -32,6 +32,18 @@ void DepsgraphRelationBuilder::build_scene_render(Scene *scene, ViewLayer *view_
}
}
void DepsgraphRelationBuilder::build_scene_camera(Scene *scene)
{
if (scene->camera != nullptr) {
build_object(scene->camera);
}
LISTBASE_FOREACH (TimeMarker *, marker, &scene->markers) {
if (!ELEM(marker->camera, nullptr, scene->camera)) {
build_object(marker->camera);
}
}
}
void DepsgraphRelationBuilder::build_scene_parameters(Scene *scene)
{
if (built_map_.checkIsBuiltAndTag(scene, BuilderMap::TAG_PARAMETERS)) {

4
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
View File

@@ -118,9 +118,7 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene,
build_view_layer_collections(view_layer);
if (scene->camera != nullptr) {
build_object(scene->camera);
}
build_scene_camera(scene);
/* Rigidbody. */
if (scene->rigidbody_world != nullptr) {
build_rigidbody(scene);