From 00b39c4e5b91b4291bb41a0ea1f7413d8aeba9f9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 7 Aug 2013 03:55:21 +0000
Subject: code cleanup: more confusion with 0/NULL/false

---
 source/blender/blenkernel/intern/DerivedMesh.c     |  6 +++---
 source/blender/blenkernel/intern/editderivedmesh.c |  2 +-
 source/blender/blenkernel/intern/key.c             |  3 ++-
 source/blender/blenkernel/intern/multires.c        |  2 +-
 source/blender/blenkernel/intern/pbvh.c            | 20 ++++++++++----------
 source/blender/blenkernel/intern/subsurf_ccg.c     |  2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 8fedb425af1..2ece90183bd 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2635,9 +2635,9 @@ void DM_add_tangent_layer(DerivedMesh *dm)
 	
 	/* 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;
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index feb18c3babe..e8e56c6f17b 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -1064,7 +1064,7 @@ static void emDM_drawMappedFacesMat(DerivedMesh *dm,
 	const float (*vertexNos)[3];
 	const float (*polyNos)[3];
 	BMFace *efa;
-	DMVertexAttribs attribs = {{{0}}};
+	DMVertexAttribs attribs = {{{NULL}}};
 	GPUVertexAttribs gattribs;
 	int i, matnr, new_matnr;
 
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 5b8929e49fe..d2d2cb1c2d0 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -190,7 +190,8 @@ Key *BKE_key_copy_nolib(Key *key)
 	Key *keyn;
 	KeyBlock *kbn, *kb;
 	
-	if (key == 0) return 0;
+	if (key == NULL)
+		return NULL;
 	
 	keyn = MEM_dupallocN(key);
 
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 95bf56d00f2..32ca3ea6d5a 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -245,7 +245,7 @@ static void multires_mdisps_subdivide_hidden(MDisps *md, int new_level)
 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;
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 9290ccc8c5d..205159c94a1 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -838,12 +838,12 @@ static void free_tree(node_tree *tree)
 {
 	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 @@ static void BKE_pbvh_search_callback_occluded(PBVH *bvh,
 {
 	PBVHIter iter;
 	PBVHNode *node;
-	node_tree *tree = 0;
+	node_tree *tree = NULL;
 
 	pbvh_iter_begin(&iter, bvh, scb, search_data);
 
@@ -1356,7 +1356,7 @@ void BKE_pbvh_node_get_proxies(PBVHNode *node, PBVHProxyNode **proxies, int *pro
 		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 @@ void BKE_pbvh_node_free_proxies(PBVHNode *node)
 
 		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 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
 	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);
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index cc33727030a..35482d9553d 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -3139,7 +3139,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 	int numTex, numCol;
 	int hasPCol, hasOrigSpace;
 	int gridInternalEdges;
-	WeightTable wtable = {0};
+	WeightTable wtable = {NULL};
 	/* MCol *mcol; */ /* UNUSED */
 	MEdge *medge = NULL;
 	/* MFace *mface = NULL; */
-- 
cgit v1.2.3