diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
| commit | 871b7ba8922650c34b487fec29a9d677b1aeadfd (patch) | |
| tree | a13c8635e43919aed3ad48afe096f6501bbeb9a2 /source/blender/depsgraph | |
| parent | 55263c8a4c03c1add138e5191f98a8b68591289f (diff) | |
| parent | 9fd0060c0f3458e53b38003d1388f16cb56f45d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 5ced5276350..ab4e774a3c2 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -385,7 +385,8 @@ void DepsgraphNodeBuilder::end_build() } } -void DepsgraphNodeBuilder::build_id(ID *id) { +void DepsgraphNodeBuilder::build_id(ID *id) +{ if (id == NULL) { return; } |