[Bf-blender-cvs] [3ffc5c9] missing-libs: Moar cleanup.
Bastien Montagne
noreply at git.blender.org
Wed Oct 14 20:24:36 CEST 2015
Commit: 3ffc5c92097127ba7874d98b25ff560fa82c08e9
Author: Bastien Montagne
Date: Wed Oct 14 20:15:46 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB3ffc5c92097127ba7874d98b25ff560fa82c08e9
Moar cleanup.
===================================================================
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenlib/BLI_array_utils.h
M source/blender/blenlib/BLI_utildefines.h
M source/blender/blenlib/intern/array_utils.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 8eed1f4..f078a93 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -163,7 +163,7 @@ void BKE_curve_free(Curve *cu)
void BKE_curve_init(Curve *cu)
{
- BLI_assert(MEMCMP_NULL_STRUCT_OFS(cu, id));
+ /* BLI_assert(MEMCMP_NULL_STRUCT_OFS(cu, id)); */ /* cu->type is already initialized... */
copy_v3_fl(cu->size, 1.0f);
cu->flag = CU_FRONT | CU_BACK | CU_DEFORM_BOUNDS_OFF | CU_PATH_RADIUS;
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 415dab6..e0fb27d 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -267,9 +267,9 @@ void BKE_lattice_init(Lattice *lt)
Lattice *BKE_lattice_add(Main *bmain, const char *name)
{
Lattice *lt;
-
+
lt = BKE_libblock_alloc(bmain, ID_LT, name);
-
+
BKE_lattice_init(lt);
return lt;
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 48f1a1a..bab2a5d 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -106,11 +106,11 @@ void BKE_mball_init(MetaBall *mb)
MetaBall *BKE_mball_add(Main *bmain, const char *name)
{
MetaBall *mb;
-
+
mb = BKE_libblock_alloc(bmain, ID_MB, name);
-
+
BKE_mball_init(mb);
-
+
return mb;
}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index d2093e1..b3cca03 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -514,9 +514,9 @@ void BKE_mesh_init(Mesh *me)
Mesh *BKE_mesh_add(Main *bmain, const char *name)
{
Mesh *me;
-
+
me = BKE_libblock_alloc(bmain, ID_ME, name);
-
+
BKE_mesh_init(me);
return me;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 916e659..c493915 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -974,7 +974,7 @@ void *BKE_object_obdata_add_from_type(Main *bmain, int type, const char *name)
void BKE_object_init(Object *ob)
{
- BLI_assert(MEMCMP_NULL_STRUCT_OFS(ob, id));
+ /* BLI_assert(MEMCMP_NULL_STRUCT_OFS(ob, id)); */ /* ob->type is already initialized... */
ob->col[0] = ob->col[1] = ob->col[2] = 1.0;
ob->col[3] = 1.0;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 403fab3..d4a8d29 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -741,6 +741,8 @@ void BKE_scene_init(Scene *sce)
copy_v2_fl2(sce->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f);
copy_v2_fl2(sce->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f);
copy_v2_fl2(sce->safe_areas.action_center, 15.0f / 100.0f, 5.0f / 100.0f);
+
+ sce->preview = NULL;
}
Scene *BKE_scene_add(Main *bmain, const char *name)
@@ -751,8 +753,6 @@ Scene *BKE_scene_add(Main *bmain, const char *name)
BKE_scene_init(sce);
- sce->preview = NULL;
-
return sce;
}
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 50b1267..fba68c5 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -209,9 +209,9 @@ void BKE_text_init(Text *ta)
Text *BKE_text_add(Main *bmain, const char *name)
{
Text *ta;
-
+
ta = BKE_libblock_alloc(bmain, ID_TXT, name);
-
+
BKE_text_init(ta);
return ta;
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 13844d6..68e15d5 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -118,7 +118,7 @@ World *add_world(Main *bmain, const char *name)
World *wrld;
wrld = BKE_libblock_alloc(bmain, ID_WO, name);
-
+
BKE_world_init(wrld);
return wrld;
diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h
index ff7976d..36d9b2f 100644
--- a/source/blender/blenlib/BLI_array_utils.h
+++ b/source/blender/blenlib/BLI_array_utils.h
@@ -46,4 +46,6 @@ int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_strid
#define BLI_array_findindex(arr, arr_len, p) \
_bli_array_findindex(arr, arr_len, sizeof(*(arr)), p)
+int BLI_memcmp_null(char *p, const size_t size);
+
#endif /* __BLI_ARRAY_UTILS_H__ */
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index d312bc0..e9c8217 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -684,10 +684,8 @@ extern void BLI_system_backtrace(FILE *fp);
# define UNLIKELY(x) (x)
#endif
-/* ***** BAD! ***** */
-/* XXX Defined in array_utils.c for now. :( */
-int BLI_memcmp_null(char *p, const size_t size);
-/* ***** END of BAD! ***** */
+/* XXX Defined in array_utils.c for now. I do not know where we should put it actually... */
+extern int BLI_memcmp_null(char *p, const size_t size);
#define MEMCMP_NULL_STRUCT_OFS(struct_var, member) \
(BLI_memcmp_null( \
diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c
index 81621dd..6c0fc4e 100644
--- a/source/blender/blenlib/intern/array_utils.c
+++ b/source/blender/blenlib/intern/array_utils.c
@@ -143,7 +143,7 @@ int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_strid
return -1;
}
-/* XXX ABSOLUTELY UGLY!!! */
+/* XXX Don't know where to put this... */
int BLI_memcmp_null(char *p, const size_t size) {
const char null_buff[4096] = {0};
char *null = (char *)null_buff;
More information about the Bf-blender-cvs
mailing list