[Bf-blender-cvs] [ce4420e803d] soc-2021-porting-modifiers-to-nodes-remesh-blocks: Changes based on review by Jacques Lucke (JacquesLucke)

[Fabian Schempp]

Commit: ce4420e803ded4b2d0e8bbb6fd1c4cb2b6c8ba22
Author: Fabian Schempp
Date:   Sun Aug 15 09:05:00 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rBce4420e803ded4b2d0e8bbb6fd1c4cb2b6c8ba22

Changes based on review by Jacques Lucke
(JacquesLucke)

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

M	CMakeLists.txt
M	source/blender/geometry/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32100b3e48a..c7d72666658 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,7 +270,7 @@ if(UNIX AND NOT APPLE)
 endif()
 
 # Geometry
-option(WITH_REMESH_DUALCON          "Enable Remesh Algorithm using Dualcon" ON)
+option(WITH_REMESH_DUALCON      "Enable Remesh Algorithm using Dualcon" ON)
 
 # Modifiers
 option(WITH_MOD_FLUID           "Enable Mantaflow Fluid Simulation Framework" ON)
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index 3f2e094d285..d5a67b9c6ab 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -16,31 +16,31 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-        .
-        ../blenkernel
-        ../blenlib
-        ../makesdna
-        ../../../intern/guardedalloc
-        )
+  .
+  ../blenkernel
+  ../blenlib
+  ../makesdna
+  ../../../intern/guardedalloc
+)
 
 set(SRC
-        intern/remesh_blocks.c
-        GEO_mesh_remesh_blocks.h
-        )
+  intern/remesh_blocks.c
+  GEO_mesh_remesh_blocks.h
+)
 
 set(LIB
-        bf_blenkernel
-        bf_blenlib
-        )
+  bf_blenkernel
+  bf_blenlib
+)
 
 if(WITH_REMESH_DUALCON)
-    list(APPEND INC
-            ../../../intern/dualcon
-            )
-    list(APPEND LIB
-            bf_intern_dualcon
-            )
-    add_definitions(-DWITH_REMESH_DUALCON)
+  list(APPEND INC
+    ../../../intern/dualcon
+  )
+  list(APPEND LIB
+    bf_intern_dualcon
+  )
+  add_definitions(-DWITH_REMESH_DUALCON)
 endif()
 
 blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 8b15dbc9039..fcda05846d7 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -396,7 +396,7 @@ if(WITH_BULLET)
   if(NOT WITH_SYSTEM_BULLET)
   list(APPEND LIB
     extern_bullet
-    )
+  )
   endif()
 
   list(APPEND LIB
@@ -468,15 +468,15 @@ endif()
 
 if(WITH_OPENVDB)
   list(APPEND INC
-          ../../../intern/openvdb
-          )
+    ../../../intern/openvdb
+  )
   list(APPEND INC_SYS
-          ${OPENVDB_INCLUDE_DIRS}
-          )
+    ${OPENVDB_INCLUDE_DIRS}
+  )
   list(APPEND LIB
-          bf_intern_openvdb
-          ${OPENVDB_LIBRARIES}
-          )
+    bf_intern_openvdb
+    ${OPENVDB_LIBRARIES}
+  )
   add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
 endif()
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc b/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
index 48c4fc7cf37..25ae8ab3e9e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
@@ -69,7 +69,7 @@ static void geo_node_remesh_blocks_exec(GeoNodeExecParams params)
 
     BKE_mesh_copy_parameters_for_eval(output_mesh, input_mesh);
     BKE_mesh_calc_edges(output_mesh, true, false);
-    output_mesh->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
+    BKE_mesh_normals_tag_dirty(output_mesh);
 
     geometry_set.replace_mesh(output_mesh);
   }