diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-01 17:31:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-01 17:31:56 +0300 |
| commit | 237e17a957ea16d4f326f8babfdb49b8d954e529 (patch) | |
| tree | beb289cb17adf0d4b7ad3e539be0f727cb61476c /source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc | |
| parent | 3bc8e88643667e4b5c45ca7cbe8e61934c82c702 (diff) | |
| parent | e5d8b04abe0524ea31c1ef158a0cfba83e739b04 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc index db71dad5e5f..2041235ade1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc @@ -71,7 +71,7 @@ void DepsgraphNodeBuilder::build_scene(Main *bmain, Scene *scene) add_id_node(&scene->id); /* timesource */ - add_time_source(NULL); + add_time_source(); /* build subgraph for set, and link this in... */ // XXX: depending on how this goes, that scene itself could probably store its |