diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-10 21:40:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-10 21:40:31 +0300 |
| commit | 50b67d83a9eb2f19fe3ed09efa99a253ea9ec136 (patch) | |
| tree | 4ade86e5bc04e67beeefd0a6206f59763ef08ea2 /source/blender/depsgraph/intern | |
| parent | f305aba8688a2b88b6495985435cc79213a22a3f (diff) | |
| parent | 42c346028f535968dfb90ca446e794dd2bc874f9 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesrna/intern/rna_space.c
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 9 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index b87bbb60479..9036fbecc88 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -638,12 +638,13 @@ void DepsgraphNodeBuilder::build_world(World *world) return; } - /* world itself */ - add_id_node(world_id); /* world shading/params? */ - build_animdata(world_id); - /* TODO: other settings? */ + /* world itself */ + add_component_node(world_id, DEPSNODE_TYPE_PARAMETERS); + + add_operation_node(world_id, DEPSNODE_TYPE_PARAMETERS, DEPSOP_TYPE_EXEC, NULL, + DEG_OPCODE_PLACEHOLDER, "Parameters Eval"); /* textures */ build_texture_stack(world->mtex); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 27a24031911..abf0fc438eb 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1129,7 +1129,13 @@ void DepsgraphRelationBuilder::build_world(World *world) build_texture_stack(world->mtex); /* world's nodetree */ - build_nodetree(world->nodetree); + if (world->nodetree != NULL) { + build_nodetree(world->nodetree); + ComponentKey ntree_key(&world->nodetree->id, DEPSNODE_TYPE_PARAMETERS); + ComponentKey world_key(world_id, DEPSNODE_TYPE_PARAMETERS); + add_relation(ntree_key, world_key, + DEPSREL_TYPE_COMPONENT_ORDER, "NTree->World Parameters"); + } } void DepsgraphRelationBuilder::build_rigidbody(Scene *scene) |