[Bf-blender-cvs] [7bad25040a5] soc-2021-porting-modifiers-to-nodes-remesh-blocks: - renamed WITH_MOD_REMESH to WITH_REMESH_DUALCON since it is now shared between node and modifier no longer specific to the modifier.
Fabian Schempp
noreply at git.blender.org
Wed Jul 14 00:23:55 CEST 2021
Commit: 7bad25040a538ddeb0372cc3aa6a656ecafcfb7c
Author: Fabian Schempp
Date: Wed Jul 14 00:23:50 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB7bad25040a538ddeb0372cc3aa6a656ecafcfb7c
- renamed WITH_MOD_REMESH to WITH_REMESH_DUALCON
since it is now shared between node and modifier no longer specific to
the modifier.
===================================================================
M CMakeLists.txt
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_lite.cmake
M build_files/cmake/config/blender_release.cmake
M intern/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/mesh_remesh_blocks.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_build_options.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91ac63d5e50..685b8aeb254 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,7 @@ endif()
# Modifiers
option(WITH_MOD_FLUID "Enable Mantaflow Fluid Simulation Framework" ON)
-option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
+option(WITH_REMESH_DUALCON "Enable Remesh Modifier" ON)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" ON)
# Image format support
@@ -1981,7 +1981,7 @@ if(FIRST_RUN)
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
- info_cfg_option(WITH_MOD_REMESH)
+ info_cfg_option(WITH_REMESH_DUALCON)
info_cfg_text("OpenGL:")
if(WIN32)
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index ccd5b47c776..b58f16731f2 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -37,7 +37,7 @@ set(WITH_LZMA ON CACHE BOOL "" FORCE)
set(WITH_LZO ON CACHE BOOL "" FORCE)
set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE)
set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE)
+set(WITH_REMESH_DUALCON ON CACHE BOOL "" FORCE)
set(WITH_NANOVDB ON CACHE BOOL "" FORCE)
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 0cd886e67d7..f7281298768 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -43,7 +43,7 @@ set(WITH_LZMA OFF CACHE BOOL "" FORCE)
set(WITH_LZO OFF CACHE BOOL "" FORCE)
set(WITH_MOD_FLUID OFF CACHE BOOL "" FORCE)
set(WITH_MOD_OCEANSIM OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH OFF CACHE BOOL "" FORCE)
+set(WITH_REMESH_DUALCON OFF CACHE BOOL "" FORCE)
set(WITH_NANOVDB OFF CACHE BOOL "" FORCE)
set(WITH_OPENAL OFF CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index b8180d733de..c053c168f22 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -38,7 +38,7 @@ set(WITH_LZMA ON CACHE BOOL "" FORCE)
set(WITH_LZO ON CACHE BOOL "" FORCE)
set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE)
set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE)
+set(WITH_REMESH_DUALCON ON CACHE BOOL "" FORCE)
set(WITH_NANOVDB ON CACHE BOOL "" FORCE)
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index dbd939e64b7..def99b98d34 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -37,7 +37,7 @@ if(WITH_AUDASPACE)
add_subdirectory(audaspace)
endif()
-if(WITH_MOD_REMESH)
+if(WITH_REMESH_DUALCON)
add_subdirectory(dualcon)
endif()
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 3bd79628743..64419bfda76 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -489,14 +489,14 @@ set(LIB
bf_simulation
)
-if(WITH_MOD_REMESH)
+if(WITH_REMESH_DUALCON)
list(APPEND INC
../../../intern/dualcon
)
list(APPEND LIB
bf_intern_dualcon
)
- add_definitions(-DWITH_MOD_REMESH)
+ add_definitions(-DWITH_REMESH_DUALCON)
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 91d7aed0292..a8d8654a544 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_blocks.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_blocks.c
@@ -34,7 +34,9 @@
#include "MEM_guardedalloc.h"
+#ifdef WITH_REMESH_DUALCON
#include "dualcon.h"
+#endif
static void init_dualcon_mesh(DualConInput *input, Mesh *mesh)
{
@@ -117,6 +119,8 @@ Mesh *BKE_mesh_remesh_blocks_to_mesh_nomain(Mesh *mesh,
const float scale,
const int depth)
{
+ #ifdef WITH_REMESH_DUALCON
+
DualConOutput *output;
DualConInput input;
Mesh *result;
@@ -162,4 +166,7 @@ Mesh *BKE_mesh_remesh_blocks_to_mesh_nomain(Mesh *mesh,
MEM_freeN(output);
return result;
+ #else
+ return mesh;
+ #endif
}
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 0138dd0c3ad..89ddf8b319a 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -141,16 +141,6 @@ if(WITH_ALEMBIC)
)
endif()
-if(WITH_MOD_REMESH)
- list(APPEND INC
- ../../../intern/dualcon
- )
- list(APPEND LIB
- bf_intern_dualcon
- )
- add_definitions(-DWITH_MOD_REMESH)
-endif()
-
if(WITH_MOD_FLUID)
add_definitions(-DWITH_FLUID)
endif()
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 42c0de30d80..f918c1f2b82 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -54,8 +54,6 @@ static void initData(ModifierData *md)
MEMCPY_STRUCT_AFTER(rmd, DNA_struct_default_get(RemeshModifierData), modifier);
}
-#ifdef WITH_MOD_REMESH
-
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh)
{
RemeshModifierData *rmd;
@@ -95,21 +93,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx)
return result;
}
-#else /* !WITH_MOD_REMESH */
-
-static Mesh *modifyMesh(ModifierData *UNUSED(md),
- const ModifierEvalContext *UNUSED(ctx),
- Mesh *mesh)
-{
- return mesh;
-}
-
-#endif /* !WITH_MOD_REMESH */
-
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
{
uiLayout *layout = panel->layout;
-#ifdef WITH_MOD_REMESH
uiLayout *row, *col;
PointerRNA ob_ptr;
@@ -142,10 +128,6 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
uiItemR(layout, ptr, "use_smooth_shade", 0, NULL, ICON_NONE);
modifier_panel_end(layout, ptr);
-
-#else /* WITH_MOD_REMESH */
- uiItemL(layout, IFACE_("Built without Remesh modifier"), ICON_NONE);
-#endif /* WITH_MOD_REMESH */
}
static void panelRegister(ARegionType *region_type)
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 2be2105d327..193d9fccaf7 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -302,8 +302,8 @@ if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM)
endif()
-if(WITH_MOD_REMESH)
- add_definitions(-DWITH_MOD_REMESH)
+if(WITH_REMESH_DUALCON)
+ add_definitions(-DWITH_REMESH_DUALCON)
endif()
if(WITH_MOD_FLUID)
diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index 676d1b8045f..4e58a33aa62 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -253,7 +253,7 @@ static PyObject *make_builtopts_info(void)
SetObjIncref(Py_False);
#endif
-#ifdef WITH_MOD_REMESH
+#ifdef WITH_REMESH_DUALCON
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
More information about the Bf-blender-cvs
mailing list