diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 16:50:13 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-28 17:10:44 +0300 |
commit | 40a9b5ebc77953a3f0b47def39438beed681aac0 (patch) | |
tree | 7c59d584e43ea837a40e064a73859909f08ca84b /source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc | |
parent | 01a348274218103ecdbaddc699a97e86f0c4ce18 (diff) |
Cleanup: changed NULL to nullptr in depsgraph C++ code
No functional changes.
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index 82a65c3129b..d5e9c024812 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -77,10 +77,10 @@ void DepsgraphNodeBuilder::build_layer_collections(ListBase *lb) void DepsgraphNodeBuilder::build_freestyle_lineset(FreestyleLineSet *fls) { - if (fls->group != NULL) { - build_collection(NULL, fls->group); + if (fls->group != nullptr) { + build_collection(nullptr, fls->group); } - if (fls->linestyle != NULL) { + if (fls->linestyle != nullptr) { build_freestyle_linestyle(fls->linestyle); } } @@ -120,19 +120,19 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene, } } build_layer_collections(&view_layer->layer_collections); - if (scene->camera != NULL) { + if (scene->camera != nullptr) { build_object(-1, scene->camera, DEG_ID_LINKED_INDIRECTLY, true); } /* Rigidbody. */ - if (scene->rigidbody_world != NULL) { + if (scene->rigidbody_world != nullptr) { build_rigidbody(scene); } /* Scene's animation and drivers. */ - if (scene->adt != NULL) { + if (scene->adt != nullptr) { build_animdata(&scene->id); } /* World. */ - if (scene->world != NULL) { + if (scene->world != nullptr) { build_world(scene->world); } /* Cache file. */ @@ -148,7 +148,7 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene, build_movieclip(clip); } /* Material override. */ - if (view_layer->mat_override != NULL) { + if (view_layer->mat_override != nullptr) { build_material(view_layer->mat_override); } /* Freestyle linesets. */ @@ -170,7 +170,7 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene, build_scene_compositor(scene); build_scene_parameters(scene); /* Build all set scenes. */ - if (scene->set != NULL) { + if (scene->set != nullptr) { ViewLayer *set_view_layer = BKE_view_layer_default_render(scene->set); build_view_layer(scene->set, set_view_layer, DEG_ID_LINKED_VIA_SET); } |