[Bf-blender-cvs] [1bebd12eafd] geometry-nodes: Cleanup: Use nullptr instead of NULL in C++ code

Hans Goudey noreply at git.blender.org
Fri Nov 20 21:20:11 CET 2020


Commit: 1bebd12eafdfb73dfbefa75394501070eb6c5591
Author: Hans Goudey
Date:   Fri Nov 20 15:10:51 2020 -0500
Branches: geometry-nodes
https://developer.blender.org/rB1bebd12eafdfb73dfbefa75394501070eb6c5591

Cleanup: Use nullptr instead of NULL in C++ code

===================================================================

M	source/blender/nodes/geometry/node_geometry_tree.cc

===================================================================

diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc
index 4bc12625fb8..dc806e7c2da 100644
--- a/source/blender/nodes/geometry/node_geometry_tree.cc
+++ b/source/blender/nodes/geometry/node_geometry_tree.cc
@@ -42,19 +42,19 @@ static void geometry_node_tree_get_from_context(const bContext *C,
   ViewLayer *view_layer = CTX_data_view_layer(C);
   Object *ob = OBACT(view_layer);
 
-  if (ob == NULL) {
+  if (ob == nullptr) {
     return;
   }
 
   const ModifierData *md = BKE_object_active_modifier(ob);
 
-  if (md == NULL) {
+  if (md == nullptr) {
     return;
   }
 
   if (md->type == eModifierType_Nodes) {
     NodesModifierData *nmd = (NodesModifierData *)md;
-    if (nmd->node_group != NULL) {
+    if (nmd->node_group != nullptr) {
       *r_from = &ob->id;
       *r_id = &ob->id;
       // *r_id = &nmd->node_group->id;



More information about the Bf-blender-cvs mailing list