[Bf-blender-cvs] [b242cc67928] master: Cleanup: Lattice: Move to IDTypeInfo and remove unused BKE API.
Bastien Montagne
noreply at git.blender.org
Fri Mar 6 16:23:29 CET 2020
Commit: b242cc67928a6858a835c088e4d3ea8822c83168
Author: Bastien Montagne
Date: Fri Mar 6 16:22:49 2020 +0100
Branches: master
https://developer.blender.org/rBb242cc67928a6858a835c088e4d3ea8822c83168
Cleanup: Lattice: Move to IDTypeInfo and remove unused BKE API.
===================================================================
M source/blender/blenkernel/BKE_idtype.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/intern/idtype.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenkernel/intern/lib_id_delete.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h
index 5dbbaa6b6dd..57782e58954 100644
--- a/source/blender/blenkernel/BKE_idtype.h
+++ b/source/blender/blenkernel/BKE_idtype.h
@@ -133,7 +133,7 @@ extern IDTypeInfo IDType_ID_MB;
// extern IDTypeInfo IDType_ID_MA;
// extern IDTypeInfo IDType_ID_TE;
// extern IDTypeInfo IDType_ID_IM;
-// extern IDTypeInfo IDType_ID_LT;
+extern IDTypeInfo IDType_ID_LT;
extern IDTypeInfo IDType_ID_LA;
extern IDTypeInfo IDType_ID_CA;
// extern IDTypeInfo IDType_ID_IP;
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index d2a5cc77cc6..8616ab19d69 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -41,14 +41,8 @@ struct Scene;
struct bGPDstroke;
void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb);
-void BKE_lattice_init(struct Lattice *lt);
struct Lattice *BKE_lattice_add(struct Main *bmain, const char *name);
-void BKE_lattice_copy_data(struct Main *bmain,
- struct Lattice *lt_dst,
- const struct Lattice *lt_src,
- const int flag);
struct Lattice *BKE_lattice_copy(struct Main *bmain, const struct Lattice *lt);
-void BKE_lattice_free(struct Lattice *lt);
void BKE_lattice_make_local(struct Main *bmain, struct Lattice *lt, const int flags);
void calc_lat_fudu(int flag, int res, float *r_fu, float *r_du);
diff --git a/source/blender/blenkernel/intern/idtype.c b/source/blender/blenkernel/intern/idtype.c
index f095d6d696a..52d6a699642 100644
--- a/source/blender/blenkernel/intern/idtype.c
+++ b/source/blender/blenkernel/intern/idtype.c
@@ -60,7 +60,7 @@ static void id_type_init(void)
// INIT_TYPE(ID_MA);
// INIT_TYPE(ID_TE);
// INIT_TYPE(ID_IM);
- // INIT_TYPE(ID_LT);
+ INIT_TYPE(ID_LT);
INIT_TYPE(ID_LA);
INIT_TYPE(ID_CA);
// INIT_TYPE(ID_IP);
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 408e870b52e..3b50e81e392 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -34,6 +34,8 @@
#include "BLI_math.h"
#include "BLI_task.h"
+#include "BLT_translation.h"
+
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
@@ -47,6 +49,7 @@
#include "BKE_anim.h"
#include "BKE_curve.h"
#include "BKE_displist.h"
+#include "BKE_idtype.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_lib_id.h"
@@ -58,6 +61,85 @@
#include "DEG_depsgraph_query.h"
+static void lattice_init_data(ID *id)
+{
+ Lattice *lattice = (Lattice *)id;
+
+ BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(lattice, id));
+
+ MEMCPY_STRUCT_AFTER(lattice, DNA_struct_default_get(Lattice), id);
+
+ lattice->def = MEM_callocN(sizeof(BPoint), "lattvert"); /* temporary */
+ BKE_lattice_resize(lattice, 2, 2, 2, NULL); /* creates a uniform lattice */
+}
+
+static void lattice_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int flag)
+{
+ Lattice *lattice_dst = (Lattice *)id_dst;
+ const Lattice *lattice_src = (const Lattice *)id_src;
+
+ lattice_dst->def = MEM_dupallocN(lattice_src->def);
+
+ if (lattice_src->key && (flag & LIB_ID_COPY_SHAPEKEY)) {
+ BKE_id_copy_ex(bmain, &lattice_src->key->id, (ID **)&lattice_dst->key, flag);
+ /* XXX This is not nice, we need to make BKE_id_copy_ex fully re-entrant... */
+ lattice_dst->key->from = &lattice_dst->id;
+ }
+
+ if (lattice_src->dvert) {
+ int tot = lattice_src->pntsu * lattice_src->pntsv * lattice_src->pntsw;
+ lattice_dst->dvert = MEM_mallocN(sizeof(MDeformVert) * tot, "Lattice MDeformVert");
+ BKE_defvert_array_copy(lattice_dst->dvert, lattice_src->dvert, tot);
+ }
+
+ lattice_dst->editlatt = NULL;
+}
+
+static void lattice_free_data(ID *id)
+{
+ Lattice *lattice = (Lattice *)id;
+
+ BKE_animdata_free(&lattice->id, false);
+
+ BKE_lattice_batch_cache_free(lattice);
+
+ MEM_SAFE_FREE(lattice->def);
+ if (lattice->dvert) {
+ BKE_defvert_array_free(lattice->dvert, lattice->pntsu * lattice->pntsv * lattice->pntsw);
+ lattice->dvert = NULL;
+ }
+ if (lattice->editlatt) {
+ Lattice *editlt = lattice->editlatt->latt;
+
+ if (editlt->def) {
+ MEM_freeN(editlt->def);
+ }
+ if (editlt->dvert) {
+ BKE_defvert_array_free(editlt->dvert, lattice->pntsu * lattice->pntsv * lattice->pntsw);
+ }
+
+ MEM_freeN(editlt);
+ MEM_freeN(lattice->editlatt);
+ lattice->editlatt = NULL;
+ }
+}
+
+IDTypeInfo IDType_ID_LT = {
+ .id_code = ID_LT,
+ .id_filter = FILTER_ID_LT,
+ .main_listbase_index = INDEX_ID_LT,
+ .struct_size = sizeof(Lattice),
+ .name = "Lattice",
+ .name_plural = "lattices",
+ .translation_context = BLT_I18NCONTEXT_ID_LATTICE,
+ .flags = 0,
+
+ .init_data = lattice_init_data,
+ .copy_data = lattice_copy_data,
+ .free_data = lattice_free_data,
+ .make_local = NULL,
+};
+
int BKE_lattice_index_from_uvw(Lattice *lt, const int u, const int v, const int w)
{
const int totu = lt->pntsu;
@@ -244,56 +326,17 @@ void BKE_lattice_resize(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
MEM_freeN(vert_coords);
}
-void BKE_lattice_init(Lattice *lt)
-{
- BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(lt, id));
-
- MEMCPY_STRUCT_AFTER(lt, DNA_struct_default_get(Lattice), id);
-
- lt->def = MEM_callocN(sizeof(BPoint), "lattvert"); /* temporary */
- BKE_lattice_resize(lt, 2, 2, 2, NULL); /* creates a uniform lattice */
-}
-
Lattice *BKE_lattice_add(Main *bmain, const char *name)
{
Lattice *lt;
lt = BKE_libblock_alloc(bmain, ID_LT, name, 0);
- BKE_lattice_init(lt);
+ lattice_init_data(<->id);
return lt;
}
-/**
- * Only copy internal data of Lattice ID from source
- * to already allocated/initialized destination.
- * You probably never want to use that directly,
- * use #BKE_id_copy or #BKE_id_copy_ex for typical needs.
- *
- * WARNING! This function will not handle ID user count!
- *
- * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
- */
-void BKE_lattice_copy_data(Main *bmain, Lattice *lt_dst, const Lattice *lt_src, const int flag)
-{
- lt_dst->def = MEM_dupallocN(lt_src->def);
-
- if (lt_src->key && (flag & LIB_ID_COPY_SHAPEKEY)) {
- BKE_id_copy_ex(bmain, <_src->key->id, (ID **)<_dst->key, flag);
- /* XXX This is not nice, we need to make BKE_id_copy_ex fully re-entrant... */
- lt_dst->key->from = <_dst->id;
- }
-
- if (lt_src->dvert) {
- int tot = lt_src->pntsu * lt_src->pntsv * lt_src->pntsw;
- lt_dst->dvert = MEM_mallocN(sizeof(MDeformVert) * tot, "Lattice MDeformVert");
- BKE_defvert_array_copy(lt_dst->dvert, lt_src->dvert, tot);
- }
-
- lt_dst->editlatt = NULL;
-}
-
Lattice *BKE_lattice_copy(Main *bmain, const Lattice *lt)
{
Lattice *lt_copy;
@@ -301,34 +344,6 @@ Lattice *BKE_lattice_copy(Main *bmain, const Lattice *lt)
return lt_copy;
}
-/** Free (or release) any data used by this lattice (does not free the lattice itself). */
-void BKE_lattice_free(Lattice *lt)
-{
- BKE_animdata_free(<->id, false);
-
- BKE_lattice_batch_cache_free(lt);
-
- MEM_SAFE_FREE(lt->def);
- if (lt->dvert) {
- BKE_defvert_array_free(lt->dvert, lt->pntsu * lt->pntsv * lt->pntsw);
- lt->dvert = NULL;
- }
- if (lt->editlatt) {
- Lattice *editlt = lt->editlatt->latt;
-
- if (editlt->def) {
- MEM_freeN(editlt->def);
- }
- if (editlt->dvert) {
- BKE_defvert_array_free(editlt->dvert, lt->pntsu * lt->pntsv * lt->pntsw);
- }
-
- MEM_freeN(editlt);
- MEM_freeN(lt->editlatt);
- lt->editlatt = NULL;
- }
-}
-
void BKE_lattice_make_local(Main *bmain, Lattice *lt, const int flags)
{
BKE_lib_id_make_local_generic(bmain, <->id, flags);
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 5015c501312..984610198ee 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -730,7 +730,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag)
BKE_image_copy_data(bmain, (Image *)*r_newid, (Image *)id, flag);
break;
case ID_LT:
- BKE_lattice_copy_data(bmain, (Lattice *)*r_newid, (Lattice *)id, flag);
+ BLI_assert(0);
break;
case ID_LA:
BLI_assert(0);
@@ -1351,7 +1351,7 @@ void BKE_libblock_init_empty(ID *id)
BKE_image_init((Image *)id);
break;
case ID_LT:
- BKE_lattice_init((Lattice *)id);
+ BLI_assert(0);
break;
case ID_LA:
BLI_assert(0);
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 286b04c5a98..183d9407363 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -164,7 +164,7 @@ void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag))
BKE_image_free((Image *)id);
break;
case ID_LT:
- BKE_lattice_free((Lattice *)id);
+ BLI_assert(0);
break;
case ID_LA:
BLI_assert(0);
More information about the Bf-blender-cvs
mailing list