[Bf-blender-cvs] [349091ce00d] master: Cleanup: Move editmesh_undo.c to C++
Hans Goudey
noreply at git.blender.org
Fri Oct 7 17:41:50 CEST 2022
Commit: 349091ce00d5ad0b8bca6c7e5ed7314ed1176c3b
Author: Hans Goudey
Date: Fri Oct 7 10:40:44 2022 -0500
Branches: master
https://developer.blender.org/rB349091ce00d5ad0b8bca6c7e5ed7314ed1176c3b
Cleanup: Move editmesh_undo.c to C++
To allow moving mesh runtime data to C++ (D16180).
===================================================================
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/mesh/CMakeLists.txt
R083 source/blender/editors/mesh/editmesh_undo.c source/blender/editors/mesh/editmesh_undo.cc
===================================================================
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index a47ffe0b99a..c100bf9b60b 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -192,7 +192,7 @@ void EDBM_automerge_and_split(struct Object *obedit,
char hflag,
float dist);
-/* editmesh_undo.c */
+/* editmesh_undo.cc */
/** Export for ED_undo_sys. */
void ED_mesh_undosys_type(struct UndoType *ut);
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index c1049e32d4c..a43968074d6 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -48,7 +48,7 @@ set(SRC
editmesh_select.cc
editmesh_select_similar.c
editmesh_tools.c
- editmesh_undo.c
+ editmesh_undo.cc
editmesh_utils.c
mesh_data.cc
mesh_mirror.c
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.cc
similarity index 83%
rename from source/blender/editors/mesh/editmesh_undo.c
rename to source/blender/editors/mesh/editmesh_undo.cc
index 44fab751de2..f5056021f7d 100644
--- a/source/blender/editors/mesh/editmesh_undo.c
+++ b/source/blender/editors/mesh/editmesh_undo.cc
@@ -70,21 +70,21 @@ static CLG_LogRef LOG = {"ed.undo.mesh"};
#ifdef USE_ARRAY_STORE
/* Single linked list of layers stored per type */
-typedef struct BArrayCustomData {
- struct BArrayCustomData *next;
+struct BArrayCustomData {
+ BArrayCustomData *next;
eCustomDataType type;
int states_len; /* number of layers for each type */
BArrayState *states[0];
-} BArrayCustomData;
+};
#endif
-typedef struct UndoMesh {
+struct UndoMesh {
/**
* This undo-meshes in `um_arraystore.local_links`.
* Not to be confused with the next and previous undo steps.
*/
- struct UndoMesh *local_next, *local_prev;
+ UndoMesh *local_next, *local_prev;
Mesh me;
int selectmode;
@@ -101,7 +101,7 @@ typedef struct UndoMesh {
int shapenr;
#ifdef USE_ARRAY_STORE
- /* NULL arrays are considered empty */
+ /* N`ull arrays are considered empty */
struct { /* most data is stored as 'custom' data */
BArrayCustomData *vdata, *edata, *ldata, *pdata;
BArrayState **keyblocks;
@@ -110,7 +110,7 @@ typedef struct UndoMesh {
#endif /* USE_ARRAY_STORE */
size_t undo_size;
-} UndoMesh;
+};
#ifdef USE_ARRAY_STORE
@@ -119,7 +119,7 @@ typedef struct UndoMesh {
* \{ */
static struct {
- struct BArrayStore_AtSize bs_stride;
+ BArrayStore_AtSize bs_stride;
int users;
/**
@@ -132,9 +132,9 @@ static struct {
TaskPool *task_pool;
# endif
-} um_arraystore = {{NULL}};
+} um_arraystore = {{nullptr}};
-static void um_arraystore_cd_compact(struct CustomData *cdata,
+static void um_arraystore_cd_compact(CustomData *cdata,
const size_t data_len,
bool create,
const BArrayCustomData *bcd_reference,
@@ -142,14 +142,14 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
{
if (data_len == 0) {
if (create) {
- *r_bcd_first = NULL;
+ *r_bcd_first = nullptr;
}
}
const BArrayCustomData *bcd_reference_current = bcd_reference;
- BArrayCustomData *bcd = NULL, *bcd_first = NULL, *bcd_prev = NULL;
+ BArrayCustomData *bcd = nullptr, *bcd_first = nullptr, *bcd_prev = nullptr;
for (int layer_start = 0, layer_end; layer_start < cdata->totlayer; layer_start = layer_end) {
- const eCustomDataType type = cdata->layers[layer_start].type;
+ const eCustomDataType type = eCustomDataType(cdata->layers[layer_start].type);
/* Perform a full copy on dynamic layers.
*
@@ -176,7 +176,7 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
const int stride = CustomData_sizeof(type);
BArrayStore *bs = create ? BLI_array_store_at_size_ensure(
&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE) :
- NULL;
+ nullptr;
const int layer_len = layer_end - layer_start;
if (create) {
@@ -184,7 +184,7 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
/* common case, the reference is aligned */
}
else {
- bcd_reference_current = NULL;
+ bcd_reference_current = nullptr;
/* Do a full lookup when unaligned. */
if (bcd_reference) {
@@ -201,8 +201,9 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
}
if (create) {
- bcd = MEM_callocN(sizeof(BArrayCustomData) + (layer_len * sizeof(BArrayState *)), __func__);
- bcd->next = NULL;
+ bcd = static_cast<BArrayCustomData *>(
+ MEM_callocN(sizeof(BArrayCustomData) + (layer_len * sizeof(BArrayState *)), __func__));
+ bcd->next = nullptr;
bcd->type = type;
bcd->states_len = layer_end - layer_start;
@@ -223,23 +224,23 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
BArrayState *state_reference = (bcd_reference_current &&
i < bcd_reference_current->states_len) ?
bcd_reference_current->states[i] :
- NULL;
+ nullptr;
/* See comment on `layer_type_is_dynamic` above. */
if (layer_type_is_dynamic) {
- state_reference = NULL;
+ state_reference = nullptr;
}
bcd->states[i] = BLI_array_store_state_add(
bs, layer->data, (size_t)data_len * stride, state_reference);
}
else {
- bcd->states[i] = NULL;
+ bcd->states[i] = nullptr;
}
}
if (layer->data) {
MEM_freeN(layer->data);
- layer->data = NULL;
+ layer->data = nullptr;
}
}
@@ -260,7 +261,7 @@ static void um_arraystore_cd_compact(struct CustomData *cdata,
* The layers and the states are stored together so this can be kept working.
*/
static void um_arraystore_cd_expand(const BArrayCustomData *bcd,
- struct CustomData *cdata,
+ CustomData *cdata,
const size_t data_len)
{
CustomDataLayer *layer = cdata->layers;
@@ -275,7 +276,7 @@ static void um_arraystore_cd_expand(const BArrayCustomData *bcd,
UNUSED_VARS_NDEBUG(stride, data_len);
}
else {
- layer->data = NULL;
+ layer->data = nullptr;
}
layer++;
}
@@ -309,43 +310,44 @@ static void um_arraystore_compact_ex(UndoMesh *um, const UndoMesh *um_ref, bool
Mesh *me = &um->me;
um_arraystore_cd_compact(
- &me->vdata, me->totvert, create, um_ref ? um_ref->store.vdata : NULL, &um->store.vdata);
+ &me->vdata, me->totvert, create, um_ref ? um_ref->store.vdata : nullptr, &um->store.vdata);
um_arraystore_cd_compact(
- &me->edata, me->totedge, create, um_ref ? um_ref->store.edata : NULL, &um->store.edata);
+ &me->edata, me->totedge, create, um_ref ? um_ref->store.edata : nullptr, &um->store.edata);
um_arraystore_cd_compact(
- &me->ldata, me->totloop, create, um_ref ? um_ref->store.ldata : NULL, &um->store.ldata);
+ &me->ldata, me->totloop, create, um_ref ? um_ref->store.ldata : nullptr, &um->store.ldata);
um_arraystore_cd_compact(
- &me->pdata, me->totpoly, create, um_ref ? um_ref->store.pdata : NULL, &um->store.pdata);
+ &me->pdata, me->totpoly, create, um_ref ? um_ref->store.pdata : nullptr, &um->store.pdata);
if (me->key && me->key->totkey) {
const size_t stride = me->key->elemsize;
BArrayStore *bs = create ? BLI_array_store_at_size_ensure(
&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE) :
- NULL;
+ nullptr;
if (create) {
- um->store.keyblocks = MEM_mallocN(me->key->totkey * sizeof(*um->store.keyblocks), __func__);
+ um->store.keyblocks = static_cast<BArrayState **>(
+ MEM_mallocN(me->key->totkey * sizeof(*um->store.keyblocks), __func__));
}
- KeyBlock *keyblock = me->key->block.first;
+ KeyBlock *keyblock = static_cast<KeyBlock *>(me->key->block.first);
for (int i = 0; i < me->key->totkey; i++, keyblock = keyblock->next) {
if (create) {
BArrayState *state_reference = (um_ref && um_ref->me.key && (i < um_ref->me.key->totkey)) ?
um_ref->store.keyblocks[i] :
- NULL;
+ nullptr;
um->store.keyblocks[i] = BLI_array_store_state_add(
bs, keyblock->data, (size_t)keyblock->totelem * stride, state_reference);
}
if (keyblock->data) {
MEM_freeN(keyblock->data);
- keyblock->data = NULL;
+ keyblock->data = nullptr;
}
}
}
if (me->mselect && me->totselect) {
- BLI_assert(create == (um->store.mselect == NULL));
+ BLI_assert(create == (um->store.mselect == nullptr));
if (create) {
- BArrayState *state_reference = um_ref ? um_ref->store.mselect : NULL;
+ BArrayState *state_reference = um_ref ? um_ref->store.mselect : nullptr;
const size_t stride = sizeof(*me->mselect);
BArrayStore *bs = BLI_array_store_at_size_ensure(
&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE);
@@ -355,7 +357,7 @@ static void um_arraystore_compact_ex(UndoMesh *um, const UndoMesh *um_ref, bool
/* keep me->totselect for validation */
MEM_freeN(me->mselect);
- me->mselect = NULL;
+ me->mselect = nullptr;
}
if (create) {
@@ -416,11 +418,11 @@ static void um_arraystore_compact_with_info(UndoMesh *um, const UndoMesh *um_ref
struct UMArrayData {
UndoMesh *um;
- const UndoMesh *um_ref; /* can be NULL */
+ const UndoMesh *um_ref; /* can be nullptr */
};
-static void um_arraystore_compact_cb(TaskPoo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list