Revision: 45455
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45455
Author: campbellbarton
Date: 2012-04-07 12:37:15 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
code cleanup: no functional changes
- memset(..., -1) is used incorrectly even though it worked: MOD_solidify.c -
thanks Halley from IRC for noticing this. use fill_vn_i() instead.
- quiet warnings in editmesh_slide.c
- cleanup comments in bmesh and some other minor comment additions.
Modified Paths:
--------------
trunk/blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenlib/BLI_array.h
trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
trunk/blender/source/blender/bmesh/bmesh_class.h
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_genfile.h
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_select.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
===================================================================
--- trunk/blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
2012-04-07 03:15:20 UTC (rev 45454)
+++ trunk/blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
2012-04-07 12:37:15 UTC (rev 45455)
@@ -57,7 +57,7 @@
LOD_EdgeInd collapse_edge
){
- // we need to copy the egdes in e_v0v1 from the mesh
+ // we need to copy the edges in e_v0v1 from the mesh
// into a new buffer -> we are going to modify them
int original_size = e_v0v1.size();
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-04-07
03:15:20 UTC (rev 45454)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-04-07
12:37:15 UTC (rev 45455)
@@ -272,7 +272,7 @@
CTX_wm_menu_set(C, NULL);
}
- /* this can happen when active scene was lib-linked, and doesnt exist
anymore */
+ /* this can happen when active scene was lib-linked, and doesn't exist
anymore */
if (CTX_data_scene(C)==NULL) {
CTX_data_scene_set(C, bfd->main->scene.first);
CTX_wm_screen(C)->scene= CTX_data_scene(C);
@@ -472,7 +472,7 @@
char mainstr[sizeof(G.main->name)];
int success=0, fileflags;
- /* This is needed so undoing/redoing doesnt crash with threaded
previews going */
+ /* This is needed so undoing/redoing doesn't crash with threaded
previews going */
WM_jobs_stop_all(CTX_wm_manager(C));
BLI_strncpy(mainstr, G.main->name, sizeof(mainstr)); /* temporal
store */
Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-07 03:15:20 UTC
(rev 45454)
+++ trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-07 12:37:15 UTC
(rev 45455)
@@ -64,7 +64,7 @@
#define BLI_array_staticdeclare(arr, maxstatic) \
int _##arr##_count = 0;
\
void *_##arr##_tmp;
\
- char _##arr##_static[maxstatic*sizeof(arr)]
+ char _##arr##_static[maxstatic * sizeof(arr)]
/* this returns the entire size of the array, including any buffering. */
@@ -117,8 +117,8 @@
/* grow an array by a specified number of items */
#define BLI_array_growitems(arr, num) ( \
- ((void *)(arr)==NULL && (void *)(_##arr##_static) != NULL) ?
\
- ((arr= (void*)_##arr##_static), (_##arr##_count += num)) :
\
+ ((void *)(arr) == NULL && (void *)(_##arr##_static) != NULL) ?
\
+ ((arr = (void*)_##arr##_static), (_##arr##_count += num)) :
\
_bli_array_grow_items(arr, num)
\
)
@@ -141,7 +141,7 @@
)
#define BLI_array_reserve(arr, num) \
- BLI_array_growitems(arr, num), (void)(_##arr##_count -= num)
+ BLI_array_growitems(arr, num), (void)(_##arr##_count -= (num))
#define BLI_array_free(arr) \
@@ -159,7 +159,7 @@
/* resets the logical size of an array to zero, but doesn't
* free the memory. */
#define BLI_array_empty(arr) \
- _##arr##_count=0
+ _##arr##_count = 0
/* set the count of the array, doesn't actually increase the allocated array
* size. don't use this unless you know what you're doing. */
@@ -177,9 +177,9 @@
* same purpose as BLI_array_staticdeclare()
* but use when the max size is known ahead of time */
#define BLI_array_fixedstack_declare(arr, maxstatic, realsize, allocstr) \
- char _##arr##_static[maxstatic*sizeof(*(arr))];
\
- const int _##arr##_is_static= ((void *)_##arr##_static) != (
\
- arr= ((realsize) <= maxstatic) ?
\
+ char _##arr##_static[maxstatic * sizeof(*(arr))];
\
+ const int _##arr##_is_static = ((void *)_##arr##_static) != (
\
+ arr = ((realsize) <= maxstatic) ?
\
(void *)_##arr##_static :
\
MEM_mallocN(sizeof(*(arr)) * (realsize), allocstr)
\
)
\
Modified: trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c 2012-04-07
03:15:20 UTC (rev 45454)
+++ trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c 2012-04-07
12:37:15 UTC (rev 45455)
@@ -150,7 +150,7 @@
MEM_freeN(message);
message= NULL;
- /* retval doesnt include \0 terminator */
+ /* retval doesn't include \0 terminator */
len= retval + 1;
}
else
@@ -206,7 +206,7 @@
MEM_freeN(message);
message= NULL;
- /* retval doesnt include \0 terminator */
+ /* retval doesn't include \0 terminator */
len= retval + 1;
}
else
Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h 2012-04-07 03:15:20 UTC
(rev 45454)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h 2012-04-07 12:37:15 UTC
(rev 45455)
@@ -45,7 +45,7 @@
* pointers. this is a requirement of mempool's method of
* iteration.
*
- * hrm. it doesnt but stull works ok, remove the comment above? - campbell.
+ * hrm. it doesn't but stull works ok, remove the comment above? - campbell.
*/
/**
@@ -55,7 +55,7 @@
* hold several types of data
*
* 1: The type of the element (vert, edge, loop or face)
- * 2: Persistent "header" flags/markings (smooth, seam, select, hidden, ect)
+ * 2: Persistent "header" flags/markings (smooth, seam, select, hidden, etc)
* note that this is different from the "tool" flags.
* 3: Unique ID in the bmesh.
* 4: some elements for internal record keeping.
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-04-07
03:15:20 UTC (rev 45454)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-04-07
12:37:15 UTC (rev 45455)
@@ -397,7 +397,7 @@
/* --- */
- /* now calcualte every points angle around the normal (signed) */
+ /* now calculate every points angle around the normal (signed) */
vang = MEM_mallocN(sizeof(AngleIndexPair) * totv, __func__);
for (i = 0; i < totv; i++) {
@@ -521,7 +521,7 @@
* api functions that take a filter callback.....
* and this new filter type will be for opstack flags.
* This is because the BM_remove_taggedXXX functions bypass iterator API.
- * - Ops don't care about 'UI' considerations like selection state, hide
state, ect.
+ * - Ops don't care about 'UI' considerations like selection state, hide
state, etc.
* If you want to work on unhidden selections for instance,
* copy output from a 'select context' operator to another operator....
*/
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-04-07
03:15:20 UTC (rev 45454)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-04-07
12:37:15 UTC (rev 45455)
@@ -850,7 +850,7 @@
return TRUE;
}
-/* Midlevel Topology Manipulation Functions */
+/* Mid-level Topology Manipulation Functions */
/**
* \brief Join Connected Faces
@@ -1015,7 +1015,7 @@
bm_elements_systag_disable(bm, faces, totface, _FLAG_JF);
BM_ELEM_API_FLAG_DISABLE(newf, _FLAG_JF);
- /* handle multires data */
+ /* handle multi-res data */
if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
l_iter = l_first = BM_FACE_FIRST_LOOP(newf);
do {
@@ -1185,7 +1185,7 @@
f2len++;
} while ((l_iter = l_iter->next) != l_first);
- /* link up the new loops into the new edges radia */
+ /* link up the new loops into the new edges radial */
bmesh_radial_append(e, f1loop);
bmesh_radial_append(e, f2loop);
@@ -1266,13 +1266,13 @@
/* swap out tv for nv in e */
bmesh_edge_swapverts(e, tv, nv);
- /* add e to nv's disk cycl */
+ /* add e to nv's disk cycle */
bmesh_disk_edge_append(e, nv);
- /* add ne to nv's disk cycl */
+ /* add ne to nv's disk cycle */
bmesh_disk_edge_append(ne, nv);
- /* add ne to tv's disk cycl */
+ /* add ne to tv's disk cycle */
bmesh_disk_edge_append(ne, tv);
/* verify disk cycle */
@@ -1283,7 +1283,7 @@
edok = bmesh_disk_validate(2, nv->e, nv);
BMESH_ASSERT(edok != FALSE);
- /* Split the radial cycle if presen */
+ /* Split the radial cycle if present */
nextl = e->l;
e->l = NULL;
if (nextl) {
@@ -1305,12 +1305,12 @@
nl->next->prev = nl;
nl->v = nv;
- /* assign the correct edge to the correct loo */
+ /* assign the correct edge to the correct loop */
if (bmesh_verts_in_edge(nl->v, nl->next->v, e)) {
nl->e = e;
l->e = ne;
- /* append l into ne's rad cycl */
+ /* append l into ne's rad cycle */
if (!first1) {
first1 = 1;
l->radial_next = l->radial_prev = NULL;
@@ -1328,7 +1328,7 @@
nl->e = ne;
l->e = e;
- /* append l into ne's rad cycl */
+ /* append l into ne's rad cycle */
if (!first1) {
first1 = 1;
l->radial_next = l->radial_prev = NULL;
@@ -1345,13 +1345,13 @@
}
- /* verify length of radial cycl */
+ /* verify length of radial cycle */
edok = bmesh_radial_validate(radlen, e->l);
BMESH_ASSERT(edok != FALSE);
edok = bmesh_radial_validate(radlen, ne->l);
BMESH_ASSERT(edok != FALSE);
- /* verify loop->v and loop->next->v pointers for */
+ /* verify loop->v and loop->next->v pointers for e */
for (i = 0, l = e->l; i < radlen; i++, l = l->radial_next) {
BMESH_ASSERT(l->e == e);
//BMESH_ASSERT(l->radial_next == l);
@@ -1368,7 +1368,7 @@
BM_CHECK_ELEMENT(bm, l->e);
BM_CHECK_ELEMENT(bm, l->f);
}
- /* verify loop->v and loop->next->v pointers for n */
+ /* verify loop->v and loop->next->v pointers for ne */
for (i = 0, l = ne->l; i < radlen; i++, l = l->radial_next) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
