[Bf-blender-cvs] [e1f9b7442b1] soc-2021-porting-modifiers-to-nodes-remesh-blocks: cleanup
Fabian Schempp
noreply at git.blender.org
Wed Jul 14 00:27:17 CEST 2021
Commit: e1f9b7442b103f826d4a35d563a79b097482ce62
Author: Fabian Schempp
Date: Wed Jul 14 00:27:13 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rBe1f9b7442b103f826d4a35d563a79b097482ce62
cleanup
===================================================================
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/mesh_remesh_blocks.c
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 64419bfda76..bf40e209002 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -496,7 +496,7 @@ if(WITH_REMESH_DUALCON)
list(APPEND LIB
bf_intern_dualcon
)
- add_definitions(-DWITH_REMESH_DUALCON)
+ add_definitions(-DWITH_MOD_REMESH)
endif()
if(WITH_BINRELOC)
diff --git a/source/blender/blenkernel/intern/mesh_remesh_blocks.c b/source/blender/blenkernel/intern/mesh_remesh_blocks.c
index a8d8654a544..8390168d6fa 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_blocks.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_blocks.c
@@ -35,7 +35,7 @@
#include "MEM_guardedalloc.h"
#ifdef WITH_REMESH_DUALCON
-#include "dualcon.h"
+# include "dualcon.h"
#endif
static void init_dualcon_mesh(DualConInput *input, Mesh *mesh)
@@ -119,7 +119,7 @@ Mesh *BKE_mesh_remesh_blocks_to_mesh_nomain(Mesh *mesh,
const float scale,
const int depth)
{
- #ifdef WITH_REMESH_DUALCON
+#ifdef WITH_REMESH_DUALCON
DualConOutput *output;
DualConInput input;
@@ -166,7 +166,7 @@ Mesh *BKE_mesh_remesh_blocks_to_mesh_nomain(Mesh *mesh,
MEM_freeN(output);
return result;
- #else
+#else
return mesh;
- #endif
+#endif
}
More information about the Bf-blender-cvs
mailing list