[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59486] trunk/blender/source/blender: use ints for ghash/edgehash flags, since its allocated theres not much point to try save a few bytes here.
Campbell Barton
ideasman42 at gmail.com
Sat Aug 24 22:16:15 CEST 2013
Revision: 59486
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59486
Author: campbellbarton
Date: 2013-08-24 20:16:14 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
use ints for ghash/edgehash flags, since its allocated theres not much point to try save a few bytes here.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_edgehash.h
trunk/blender/source/blender/blenlib/BLI_ghash.h
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
Modified: trunk/blender/source/blender/blenlib/BLI_edgehash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_edgehash.h 2013-08-24 17:36:45 UTC (rev 59485)
+++ trunk/blender/source/blender/blenlib/BLI_edgehash.h 2013-08-24 20:16:14 UTC (rev 59486)
@@ -51,8 +51,8 @@
bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1);
int BLI_edgehash_size(EdgeHash *eh);
void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp);
-void BLI_edgehash_flag_set(EdgeHash *eh, unsigned short flag);
-void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned short flag);
+void BLI_edgehash_flag_set(EdgeHash *eh, unsigned int flag);
+void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned int flag);
EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh);
void BLI_edgehashIterator_free(EdgeHashIterator *ehi);
@@ -65,5 +65,4 @@
#define BLI_EDGEHASH_SIZE_GUESS_FROM_LOOPS(totloop) ((totloop) / 2)
#define BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(totpoly) ((totpoly) * 2)
-
-#endif
+#endif /* __BLI_EDGEHASH_H__ */
Modified: trunk/blender/source/blender/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h 2013-08-24 17:36:45 UTC (rev 59485)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h 2013-08-24 20:16:14 UTC (rev 59486)
@@ -71,8 +71,8 @@
void *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp);
bool BLI_ghash_haskey(GHash *gh, const void *key);
int BLI_ghash_size(GHash *gh);
-void BLI_ghash_flag_set(GHash *gh, unsigned short flag);
-void BLI_ghash_flag_clear(GHash *gh, unsigned short flag);
+void BLI_ghash_flag_set(GHash *gh, unsigned int flag);
+void BLI_ghash_flag_clear(GHash *gh, unsigned int flag);
/* *** */
Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2013-08-24 17:36:45 UTC (rev 59485)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2013-08-24 20:16:14 UTC (rev 59486)
@@ -77,7 +77,7 @@
struct BLI_mempool *entrypool;
unsigned int nbuckets;
unsigned int nentries;
- unsigned short cursize, flag;
+ unsigned int cursize, flag;
};
@@ -343,14 +343,14 @@
MEM_freeN(gh);
}
-void BLI_ghash_flag_set(GHash *gh, unsigned short flag)
+void BLI_ghash_flag_set(GHash *gh, unsigned int flag)
{
gh->flag |= flag;
}
-void BLI_ghash_flag_clear(GHash *gh, unsigned short flag)
+void BLI_ghash_flag_clear(GHash *gh, unsigned int flag)
{
- gh->flag &= (unsigned short)~flag;
+ gh->flag &= ~flag;
}
Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c 2013-08-24 17:36:45 UTC (rev 59485)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c 2013-08-24 20:16:14 UTC (rev 59486)
@@ -75,7 +75,7 @@
EdgeEntry **buckets;
BLI_mempool *epool;
unsigned int nbuckets, nentries;
- unsigned short cursize, flag;
+ unsigned int cursize, flag;
};
@@ -295,14 +295,14 @@
}
-void BLI_edgehash_flag_set(EdgeHash *eh, unsigned short flag)
+void BLI_edgehash_flag_set(EdgeHash *eh, unsigned int flag)
{
eh->flag |= flag;
}
-void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned short flag)
+void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned int flag)
{
- eh->flag &= (unsigned short)~flag;
+ eh->flag &= ~flag;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-08-24 17:36:45 UTC (rev 59485)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-08-24 20:16:14 UTC (rev 59486)
@@ -667,7 +667,7 @@
if (!(vert_idx || edge_idx || face_idx))
return;
- /* Remap vertices */
+ /* Remap Verts */
if (vert_idx) {
BMVert **verts_pool, *verts_copy, **vep;
int i, totvert = bm->totvert;
@@ -701,7 +701,7 @@
MEM_freeN(verts_copy);
}
- /* XXX Code not tested yet (though I don't why it would fail)! */
+ /* Remap Edges */
if (edge_idx) {
BMEdge **edges_pool, *edges_copy, **edp;
int i, totedge = bm->totedge;
@@ -734,7 +734,7 @@
MEM_freeN(edges_copy);
}
- /* XXX Code not tested yet (though I don't why it would fail)! */
+ /* Remap Faces */
if (face_idx) {
BMFace **faces_pool, *faces_copy, **fap;
int i, totface = bm->totface;
More information about the Bf-blender-cvs
mailing list