Commit: 52ce0e546ef77ba7877d75740a72cdcd22c2b75f
Author: Grigory Revzin
Date: Sat Jun 21 01:59:21 2014 +0400
https://developer.blender.org/rB52ce0e546ef77ba7877d75740a72cdcd22c2b75f
Got rid of most GCC warnings
Mostly missing 'static' declarations and some potential bugs.
===================================================================
M source/blender/blenkernel/BKE_crazyspace.h
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_pe.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/makesrna/intern/rna_key.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_crazyspace.h
b/source/blender/blenkernel/BKE_crazyspace.h
index 968b64d3..a68d819 100644
--- a/source/blender/blenkernel/BKE_crazyspace.h
+++ b/source/blender/blenkernel/BKE_crazyspace.h
@@ -58,7 +58,7 @@ bool BKE_crazyspace_cageindexes_in_sync(struct Object *ob);
/* Maps editmesh vertex indeces to derivedmesh cage vertex indces and returns
the map.
* If returns NULL, it means that mapping failed for some reason (modifier
failing to set CD_ORIGINDEX, etc).
* It is the caller's responsibility to free the returned array! */
-int *BKE_crazyspace_map_em_to_cage(struct Object *ob, struct BMEditMesh *em,
struct DerivedMesh *cage_dm);
+int *BKE_crazyspace_map_em_to_cage(struct BMEditMesh *em, struct DerivedMesh
*cage_dm);
/* Calculates editmesh active element selection center in global space on
derived cage
* (used in calculating visual manipulator and transform constraint centers) */
diff --git a/source/blender/blenkernel/intern/crazyspace.c
b/source/blender/blenkernel/intern/crazyspace.c
index 33484ae..d7acc42 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -477,8 +477,8 @@ void BKE_crazyspace_cage_active_sel_center(BMEditSelection
*ese, DerivedMesh *ca
}
mul_v3_fl(cent, 0.5f);
}
- else if (ese->htype = BM_FACE) {
- BMFace *f = (BMFace *)ese->ele;
+ else if (ese->htype == BM_FACE) {
+ BMFace *f = (BMFace *) ese->ele;
BMVert *v;
BMIter iter;
int total = 0, index;
@@ -517,7 +517,7 @@ bool BKE_crazyspace_cageindexes_in_sync(Object *ob)
return true;
}
-int *BKE_crazyspace_map_em_to_cage(Object *ob, BMEditMesh *em, DerivedMesh
*cage_dm)
+int *BKE_crazyspace_map_em_to_cage(BMEditMesh *em, DerivedMesh *cage_dm)
{
int *derived_index_map = NULL;
diff --git a/source/blender/blenkernel/intern/editmesh.c
b/source/blender/blenkernel/intern/editmesh.c
index b71f4b0..3da53169 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -250,7 +250,7 @@ void BKE_editmesh_color_ensure(BMEditMesh *em, const char
htype)
/* ==================== topology hashing ======================= */
- unsigned int mm2_hash(char *key, unsigned int len, unsigned int seed) {
+ static unsigned int mm2_hash(char *key, unsigned int len, unsigned int seed) {
const unsigned int m = 0x5bd1e995;
char r = 24;
unsigned int h = len + seed;
@@ -279,30 +279,30 @@ void BKE_editmesh_color_ensure(BMEditMesh *em, const char
htype)
}
-int hashfunc(void *data, int len, int oldhash)
+ static int hashfunc(void *data, int len, int oldhash)
{
return (int) mm2_hash(data, len, oldhash);
}
-int hashloop_topo(BMLoop *l, int oldhash)
+ static int hashloop_topo(BMLoop *l, int oldhash)
{
/* skip header, don't track customdata */
return hashfunc(((char *)l) + sizeof(BMHeader), sizeof(BMLoop) -
sizeof(BMHeader), oldhash);
}
-int hashedge_topo(BMEdge *bme, int oldhash)
+ static int hashedge_topo(BMEdge *bme, int oldhash)
{
return hashfunc(&bme->v1, sizeof(BMEdge) - sizeof(BMHeader) -
sizeof(BMFlagLayer *), oldhash);
}
-int hashface_topo(BMFace *f, int oldhash)
+ static int hashface_topo(BMFace *f, int oldhash)
{
/* skip header & flags & face normals and material */
int a = f->len + (int)f->l_first;
return hashfunc(&a, sizeof(int), oldhash);
}
-int bmesh_topohash(BMesh *bm)
+ static int bmesh_topohash(BMesh *bm)
{
BMIter iter;
BMFace *f;
diff --git a/source/blender/blenkernel/intern/key.c
b/source/blender/blenkernel/intern/key.c
index a924507..bd91c70 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -2182,7 +2182,7 @@ void BKE_key_editdata_from_scratch(Object *ob)
#define KB_FOR_EACH_CO(kb, indexvar) \
for ((indexvar) = 0; (indexvar) < (kb)->totelem; ++(indexvar))
-void key_block_mesh_get_deltas(Key *key, KeyBlock *kb, float (*out_deltas)[3])
+static void key_block_mesh_get_deltas(Key *key, KeyBlock *kb, float
(*out_deltas)[3])
{
int a;
KeyBlock *basis = BLI_findlink(&key->block, kb->relative);
@@ -2224,7 +2224,7 @@ void BKE_key_block_mesh_eval_rel(Object *ob, Key *key,
KeyBlock *kb, bool use_vg
}
}
-void key_block_mesh_eval_scratch(Object *ob, Key *key, float (*out_offsets)[3])
+static void key_block_mesh_eval_scratch(Object *ob, Key *key,
float(*out_offsets)[3])
{
/* we need to eval a regular key, but with scratch's data */
ScratchKeyBlock *skb = &key->scratch;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 7fe68f3..42695fc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3036,13 +3036,13 @@ static void lib_link_key(FileData *fd, Main *main)
}
}
-void uncompress_kb(Key * key, KeyBlock *kb)
+static void uncompress_kb(Key * key, KeyBlock *kb)
{
int a, index;
float(*kbco)[3];
KeyBlock *rk = key->refkey;
- KB_ComprMeshDataEnt *kbcde = kb->data;
+ KB_ComprMeshDataEnt *kbcde = (KB_ComprMeshDataEnt *)kb->data;
/* allocate space for uncompressed data */
kb->data = MEM_mallocN(sizeof(float) * 3 * rk->totelem, "KeyBlock");
@@ -3073,7 +3073,7 @@ static void switch_endian_keyblock(Key *key, KeyBlock *kb)
data = kb->data;
if (kb->compressed) {
- KB_ComprMeshDataEnt *kbcde = data;
+ KB_ComprMeshDataEnt *kbcde = (KB_ComprMeshDataEnt *)data;
for (a = 0; a < kb->totelem; ++a) {
BLI_endian_switch_int32(&kbcde[a].vertex_index);
BLI_endian_switch_float_array((float *) &kbcde[a].co,
3);
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 233a382..b17defb 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1579,7 +1579,7 @@ static void write_vfonts(WriteData *wd, ListBase *idbase)
/* ========================== shape keys =============================== */
-void compress_kb(KeyBlock *kb, Key *key_owner)
+static void compress_kb(KeyBlock *kb, Key *key_owner)
{
/* the idea: we can get a space win by storing only the vertices with
changed positions */
int a, changed_verts;
@@ -1613,7 +1613,7 @@ void compress_kb(KeyBlock *kb, Key *key_owner)
kb->data = kbcde;
if (G.debug_value == 1) {
- printf("Compressed Shape Key %s, %.2f times smaller \n",
+ printf("Compressed Shape Key %s, %.2f times smaller\n",
kb->name,
(rk->totelem * sizeof(float) * 3) /
changed_verts * sizeof(KB_ComprMeshDataEnt));
}
}
diff --git a/source/blender/bmesh/intern/bmesh_pe.c
b/source/blender/bmesh/intern/bmesh_pe.c
index ecf794d..877e972 100644
--- a/source/blender/bmesh/intern/bmesh_pe.c
+++ b/source/blender/bmesh/intern/bmesh_pe.c
@@ -148,7 +148,7 @@ void BM_prop_dist_calc_connected(BMesh *bm, float
loc_to_world_mtx[3][3], float
MEM_freeN(dists_prev);
}
-void move_selected_verts_to_top(BMesh *bm, int *indexes)
+static void move_selected_verts_to_top(BMesh *bm, int *indexes)
{
BMVert *v;
BMIter viter;
@@ -171,7 +171,7 @@ void move_selected_verts_to_top(BMesh *bm, int *indexes)
}
}
-float dist_proj_sq(float a[3], float b[3], float loc_to_world_mtx[3][3], float
proj_plane_n[3])
+static float dist_proj_sq(float a[3], float b[3], float
loc_to_world_mtx[3][3], float proj_plane_n[3])
{
float v[3], v1[3];
sub_v3_v3v3(v, a, b);
@@ -181,14 +181,14 @@ float dist_proj_sq(float a[3], float b[3], float
loc_to_world_mtx[3][3], float p
return len_squared_v3(v);
}
-float dist_sq(float a[3], float b[3])
+static float dist_sq(float a[3], float b[3])
{
float v[3];
sub_v3_v3v3(v, a, b);
return len_squared_v3(v);
}
-float dist_transform(float a[3], float b[3], float loc_to_world_mtx[3][3])
+static float dist_transform(float a[3], float b[3], float
loc_to_world_mtx[3][3])
{
float v[3];
sub_v3_v3v3(v, a, b);
@@ -200,7 +200,10 @@ float dist_transform(float a[3], float b[3], float
loc_to_world_mtx[3][3])
void BM_prop_dist_calc(BMesh *bm, float loc_to_world_mtx[3][3], float
proj_plane_n[3], float dists[])
{
int a, b;
- BMVert *unsel_vert, *sel_vert, *decision_vert;
+ BMVert
+ *unsel_vert,
+ *sel_vert,
+ *decision_vert;
float dist, dist_max;
int *vindexes;
@@ -211,7 +214,8 @@ void BM_prop_dist_calc(BMesh *bm, float
loc_to_world_mtx[3][3], float proj_plane
vindexes = MEM_mallocN(sizeof(int) * bm->totvert, __func__);
- memset(dists, FLT_MAX, sizeof(float) * bm->totvert);
+ for (a = 0; a < bm->totvert; ++a)
+ dists[a] = FLT_MAX;
move_selected_verts_to_top(bm, vindexes);
/* we have to loop over all vertices for each vertex, ahh n^2
@@ -248,6 +252,7 @@ void BM_prop_dist_calc(BMesh *bm, float
loc_to_world_mtx[3][3], float proj_plane
continue;
dist_max = FLT_MAX;
+ decision_vert = NULL;
for (b = 0; b < bm->totvertsel; ++b) {
/* all selected verts are at the beginning */
diff --git a/source/blender/editors/mesh/editmesh_utils.c
b/source/blender/editors/mesh/editmesh_utils.c
index 37002d1..221c1fd 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -493,13 +493,13 @@ void EDBM_flag_enable_all(BMEditMesh *em, const char
hflag)
* The idea: detect if topology hadn't changed. If it had, run the heavy-duty
tools from bmesh_mesh_conv.c.
*/
-void shapekey_zero_warn(KeyBlock *kb)
+static void shapekey_zero_warn(KeyBlock *kb)
{
/* TODO: raise a UI warning */
printf("Warning: can't commit the scratch shape key: %s->value =
0.0\n", kb->name);
}
-void update_bmesh_shapes(Object *ob)
+static void update_bmesh_shapes(Object *ob)
{
Key *key = BKE_key_from_object(ob);
@@ -541,7 +541,7 @@ void update_bmesh_shapes(Object *ob)
}
}
-void recalc_keyblocks_from_scratch(Object *ob)
+static void recalc_keyblocks_from_scratch(Object *ob)
{
Key *k = BKE_key_from_object(ob);
Mesh *me = ob->data;
@@ -599,7 +599,6 @@ void recalc_keyblocks_from_scratch(Object *ob)
void EDBM_commit_scratch_to_active(Object *ob, Scene *s)
{
BMEditMesh *em = BKE_editmesh_from_object(ob);
- Key *key = BKE_key_from_object(ob);
bool topo_changed = BKE_editmesh_topo_has_changed(em);
if (topo_changed) {
@@ -634,7 +633,7 @@ void EDBM_update_
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
