diff options
| author | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
| commit | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (patch) | |
| tree | 2cd22d612ffba3a509d5548332c9cc8a06a1a638 /source/blender/depsgraph/intern/node/deg_node_operation.cc | |
| parent | b47883a990ee68e659a8a8b44729be9b8e0d002f (diff) | |
| parent | dc3f073d1c5255e79763dfff3ef17f6216f1b391 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/depsgraph/intern/node/deg_node_operation.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_operation.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 09a761d282f..e313b5ccee7 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -241,13 +241,13 @@ void OperationNode::tag_update(Depsgraph *graph, eUpdateSource source) void OperationNode::set_as_entry() { - BLI_assert(owner != NULL); + BLI_assert(owner != nullptr); owner->set_entry_operation(this); } void OperationNode::set_as_exit() { - BLI_assert(owner != NULL); + BLI_assert(owner != nullptr); owner->set_exit_operation(this); } |