[Bf-blender-cvs] [caee9c1aeba] temp-node-error-messages: Merge branch 'draw_node_to_cpp' into temp-node-error-messages

[Hans Goudey]

Commit: caee9c1aeba5fd23a64404fc6f3815051d3fe293
Author: Hans Goudey
Date:   Mon Feb 15 13:28:26 2021 -0600
Branches: temp-node-error-messages
https://developer.blender.org/rBcaee9c1aeba5fd23a64404fc6f3815051d3fe293

Merge branch 'draw_node_to_cpp' into temp-node-error-messages

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



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

diff --cc source/blender/editors/space_node/node_draw.cc
index 70bd1432b1b,85519e1bde0..74b094f2e93
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@@ -1258,12 -1187,12 +1261,12 @@@ static void node_draw_basis(const bCont
                              bNodeInstanceKey key)
  {
    /* float socket_size = NODE_SOCKSIZE*U.dpi/72; */ /* UNUSED */
 -  float iconbutw = 0.8f * UI_UNIT_X;
 +  const float iconbutw = NODE_HEADER_ICON_SIZE;
  
    /* skip if out of view */
-   if (BLI_rctf_isect(&node->totr, &v2d->cur, NULL) == false) {
+   if (BLI_rctf_isect(&node->totr, &v2d->cur, nullptr) == false) {
      UI_block_end(C, node->block);
-     node->block = NULL;
+     node->block = nullptr;
      return;
    }