Revision: 58983
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58983
Author: campbellbarton
Date: 2013-08-07 03:55:21 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
code cleanup: more confusion with 0/NULL/false
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/pbvh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_buffer.h
trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/modifiers/intern/MOD_skin.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -2635,9 +2635,9 @@
/* new computation method */
{
- SGLSLMeshToTangent mesh2tangent = {0};
- SMikkTSpaceContext sContext = {0};
- SMikkTSpaceInterface sInterface = {0};
+ SGLSLMeshToTangent mesh2tangent = {NULL};
+ SMikkTSpaceContext sContext = {NULL};
+ SMikkTSpaceInterface sInterface = {NULL};
mesh2tangent.precomputedFaceNormals = nors;
mesh2tangent.mtface = mtface;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -1064,7 +1064,7 @@
const float (*vertexNos)[3];
const float (*polyNos)[3];
BMFace *efa;
- DMVertexAttribs attribs = {{{0}}};
+ DMVertexAttribs attribs = {{{NULL}}};
GPUVertexAttribs gattribs;
int i, matnr, new_matnr;
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -190,7 +190,8 @@
Key *keyn;
KeyBlock *kbn, *kb;
- if (key == 0) return 0;
+ if (key == NULL)
+ return NULL;
keyn = MEM_dupallocN(key);
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -245,7 +245,7 @@
static MDisps *multires_mdisps_initialize_hidden(Mesh *me, int level)
{
MDisps *mdisps = CustomData_add_layer(&me->ldata, CD_MDISPS,
- CD_CALLOC, 0, me->totloop);
+ CD_CALLOC, NULL, me->totloop);
int gridsize = ccg_gridsize(level);
int gridarea = gridsize * gridsize;
int i, j, k;
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -838,12 +838,12 @@
{
if (tree->left) {
free_tree(tree->left);
- tree->left = 0;
+ tree->left = NULL;
}
if (tree->right) {
free_tree(tree->right);
- tree->right = 0;
+ tree->right = NULL;
}
free(tree);
@@ -860,7 +860,7 @@
{
PBVHIter iter;
PBVHNode *node;
- node_tree *tree = 0;
+ node_tree *tree = NULL;
pbvh_iter_begin(&iter, bvh, scb, search_data);
@@ -1356,7 +1356,7 @@
if (proxy_count) *proxy_count = node->proxy_count;
}
else {
- if (proxies) *proxies = 0;
+ if (proxies) *proxies = NULL;
if (proxy_count) *proxy_count = 0;
}
}
@@ -1788,11 +1788,11 @@
for (p = 0; p < node->proxy_count; p++) {
MEM_freeN(node->proxies[p].co);
- node->proxies[p].co = 0;
+ node->proxies[p].co = NULL;
}
MEM_freeN(node->proxies);
- node->proxies = 0;
+ node->proxies = NULL;
node->proxy_count = 0;
}
@@ -1836,10 +1836,10 @@
int *grid_indices, *vert_indices;
int totgrid, gridsize, uniq_verts, totvert;
- vi->grid = 0;
- vi->no = 0;
- vi->fno = 0;
- vi->mvert = 0;
+ vi->grid = NULL;
+ vi->no = NULL;
+ vi->fno = NULL;
+ vi->mvert = NULL;
BKE_pbvh_node_get_grids(bvh, node, &grid_indices, &totgrid, NULL,
&gridsize, &grids, NULL);
BKE_pbvh_node_num_verts(bvh, node, &uniq_verts, &totvert);
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -3139,7 +3139,7 @@
int numTex, numCol;
int hasPCol, hasOrigSpace;
int gridInternalEdges;
- WeightTable wtable = {0};
+ WeightTable wtable = {NULL};
/* MCol *mcol; */ /* UNUSED */
MEdge *medge = NULL;
/* MFace *mface = NULL; */
Modified: trunk/blender/source/blender/blenlib/BLI_buffer.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_buffer.h 2013-08-07 03:44:05 UTC
(rev 58982)
+++ trunk/blender/source/blender/blenlib/BLI_buffer.h 2013-08-07 03:55:21 UTC
(rev 58983)
@@ -57,7 +57,7 @@
BLI_Buffer name_ = { \
/* clear the static memory if this is a calloc'd array */ \
((void)((flag_ & BLI_BUFFER_USE_CALLOC) ? \
- memset(name_ ## _static_, 0, sizeof(name_ ## _static_)) : 0\
+ memset(name_ ## _static_, 0, sizeof(name_ ## _static_)) :
NULL \
), /* memset-end */ \
name_ ## _static_), \
sizeof(type_), \
Modified: trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -220,7 +220,7 @@
v1 = vf[0]->co;
v2 = vf[1]->co;
v3 = vf[2]->co;
- v4 = has_4_vert ? vf[3]->co : 0;
+ v4 = has_4_vert ? vf[3]->co : NULL;
if (has_4_vert) {
areaf = area_quad_v3(v1, v2, v3, v4);
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -345,7 +345,7 @@
}
#ifdef USE_SAFETY_CHECKS
- if (BM_edge_exists(l_a->v, l_b->v) == false)
+ if (BM_edge_exists(l_a->v, l_b->v) == NULL)
#endif
{
BMFace *f_new;
Modified: trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_navmesh.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/editors/mesh/mesh_navmesh.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -461,7 +461,7 @@
unsigned int lay = 0;
int nverts = 0, ntris = 0;
- int *tris = 0;
+ int *tris = NULL;
float *verts = NULL;
createVertsTrisData(C, obs, &nverts, &verts, &ntris, &tris,
&lay);
Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -1336,7 +1336,7 @@
const float mval_f[2] = {(float)mval[0],
(float)mval[1]};
- VertPickData data = {0};
+ VertPickData data = {NULL};
ED_view3d_init_mats_rv3d(ob, rv3d);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -1991,7 +1991,7 @@
/* may be an edge OR a face array */
for (i = 0; i < group_tot; i++) {
- BMEditSelection ese = {0};
+ BMEditSelection ese = {NULL};
const int fg_sta = group_index[i][0];
const int fg_len = group_index[i][1];
@@ -6421,7 +6421,7 @@
}
}
- if (tdt->area != TRACK_AREA_POINT || tdt->relative ==
0) {
+ if (tdt->area != TRACK_AREA_POINT || tdt->relative ==
NULL) {
td2d->loc2d[0] = loc2d[0];
td2d->loc2d[1] = loc2d[1];
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -362,7 +362,7 @@
ModifierData *md;
SubsurfModifierData *smd_real;
/* modifier initialization data, will control what type of subdivision
will happen*/
- SubsurfModifierData smd = {{0}};
+ SubsurfModifierData smd = {{NULL}};
/* Used to hold subsurfed Mesh */
DerivedMesh *derivedMesh, *initialDerived;
/* holds original indices for subsurfed mesh */
Modified: trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-08-07 03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-08-07 03:55:21 UTC (rev 58983)
@@ -366,7 +366,7 @@
v1 = sys->vertexCos[idv1];
v2 = sys->vertexCos[idv2];
v3 = sys->vertexCos[idv3];
- v4 = has_4_vert ? sys->vertexCos[idv4] : 0;
+ v4 = has_4_vert ? sys->vertexCos[idv4] : NULL;
if (has_4_vert) {
areaf = area_quad_v3(v1, v2, v3,
sys->vertexCos[sys->mfaces[i].v4]);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_skin.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_skin.c 2013-08-07
03:44:05 UTC (rev 58982)
+++ trunk/blender/source/blender/modifiers/intern/MOD_skin.c 2013-08-07
03:55:21 UTC (rev 58983)
@@ -1751,7 +1751,7 @@
totpoly = dm->getNumPolys(dm);
orig = CustomData_add_layer(&dm->polyData, CD_ORIGINDEX,
- CD_CALLOC, 0, totpoly);
+ CD_CALLOC, NULL, totpoly);
for (i = 0; i < totpoly; i++)
orig[i] = ORIGINDEX_NONE;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
