[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44162] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_operators.c: reduce ugly casts from previous commit.
Campbell Barton
ideasman42 at gmail.com
Thu Feb 16 17:46:53 CET 2012
Revision: 44162
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44162
Author: campbellbarton
Date: 2012-02-16 16:46:52 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
reduce ugly casts from previous commit.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-16 16:44:10 UTC (rev 44161)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-16 16:46:52 UTC (rev 44162)
@@ -845,7 +845,7 @@
*/
static void bmo_flag_layer_alloc(BMesh *bm)
{
- BMHeader *ele;
+ BMElemF *ele;
/* set the index values since we are looping over all data anyway,
* may save time later on */
int i;
@@ -865,21 +865,21 @@
/* now go through and memcpy all the flags. Loops don't get a flag layer at this time.. */
for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, old_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, old_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, old_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, old_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, old_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, old_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
@@ -890,7 +890,7 @@
static void bmo_flag_layer_free(BMesh *bm)
{
- BMHeader *ele;
+ BMElemF *ele;
/* set the index values since we are looping over all data anyway,
* may save time later on */
int i;
@@ -910,21 +910,21 @@
/* now go through and memcpy all the flag */
for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, new_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, new_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, new_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, new_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- oldflags = ((BMElemF *)ele)->oflags;
- ((BMElemF *)ele)->oflags = BLI_mempool_calloc(newpool);
- memcpy(((BMElemF *)ele)->oflags, oldflags, new_totflags_size);
+ oldflags = ele->oflags;
+ ele->oflags = BLI_mempool_calloc(newpool);
+ memcpy(ele->oflags, oldflags, new_totflags_size);
BM_elem_index_set(ele, i); /* set_inline */
}
@@ -935,7 +935,7 @@
static void bmo_flag_layer_clear(BMesh *bm)
{
- BMHeader *ele;
+ BMElemF *ele;
/* set the index values since we are looping over all data anyway,
* may save time later on */
int i;
@@ -945,15 +945,15 @@
/* now go through and memcpy all the flag */
for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- memset(((BMElemF *)ele)->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
+ memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- memset(((BMElemF *)ele)->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
+ memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
BM_elem_index_set(ele, i); /* set_inline */
}
for (ele = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
- memset(((BMElemF *)ele)->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
+ memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
BM_elem_index_set(ele, i); /* set_inline */
}
More information about the Bf-blender-cvs
mailing list