[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56561] trunk/blender/source/blender: rename BLI_ghashIterator_notDone() -> BLI_ghashIterator_done()

Campbell Barton ideasman42 at gmail.com
Wed May 8 14:58:11 CEST 2013


Revision: 56561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56561
Author:   campbellbarton
Date:     2013-05-08 12:58:11 +0000 (Wed, 08 May 2013)
Log Message:
-----------
rename BLI_ghashIterator_notDone() -> BLI_ghashIterator_done()
	was renamed fairly recently but other similar iterators not negated
	like this, would prefer to keep it as it was

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/blenkernel/BKE_pbvh.h
    trunk/blender/source/blender/blenkernel/intern/pbvh.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/blenlib/BLI_ghash.h
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
    trunk/blender/source/blender/editors/armature/editarmature_retarget.c
    trunk/blender/source/blender/editors/armature/editarmature_sketch.c
    trunk/blender/source/blender/editors/armature/reeb.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
    trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
    trunk/blender/source/blender/editors/space_text/text_autocomplete.c
    trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
    trunk/blender/source/blender/gpu/intern/gpu_codegen.c
    trunk/blender/source/blender/imbuf/intern/moviecache.c
    trunk/blender/source/blender/modifiers/intern/MOD_build.c
    trunk/blender/source/blender/modifiers/intern/MOD_mask.c
    trunk/blender/source/blender/python/intern/bpy_operator.c
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/blender/render/intern/source/sss.c
    trunk/blender/source/blender/windowmanager/intern/wm.c

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2013-05-08 12:58:11 UTC (rev 56561)
@@ -330,7 +330,7 @@
 #define NODE_TREE_TYPES_BEGIN(ntype) \
 { \
 	GHashIterator *__node_tree_type_iter__ = ntreeTypeGetIterator(); \
-	for (; BLI_ghashIterator_notDone(__node_tree_type_iter__); BLI_ghashIterator_step(__node_tree_type_iter__)) { \
+	for (; !BLI_ghashIterator_done(__node_tree_type_iter__); BLI_ghashIterator_step(__node_tree_type_iter__)) { \
 		bNodeTreeType *ntype = BLI_ghashIterator_getValue(__node_tree_type_iter__);
 
 #define NODE_TREE_TYPES_END \
@@ -406,7 +406,7 @@
 #define NODE_TYPES_BEGIN(ntype) \
 { \
 	GHashIterator *__node_type_iter__ = nodeTypeGetIterator(); \
-	for (; BLI_ghashIterator_notDone(__node_type_iter__); BLI_ghashIterator_step(__node_type_iter__)) { \
+	for (; !BLI_ghashIterator_done(__node_type_iter__); BLI_ghashIterator_step(__node_type_iter__)) { \
 		bNodeType *ntype = BLI_ghashIterator_getValue(__node_type_iter__);
 
 #define NODE_TYPES_END \
@@ -426,7 +426,7 @@
 #define NODE_SOCKET_TYPES_BEGIN(stype) \
 { \
 	GHashIterator *__node_socket_type_iter__ = nodeSocketTypeGetIterator(); \
-	for (; BLI_ghashIterator_notDone(__node_socket_type_iter__); BLI_ghashIterator_step(__node_socket_type_iter__)) { \
+	for (; !BLI_ghashIterator_done(__node_socket_type_iter__); BLI_ghashIterator_step(__node_socket_type_iter__)) { \
 		bNodeSocketType *stype = BLI_ghashIterator_getValue(__node_socket_type_iter__);
 
 #define NODE_SOCKET_TYPES_END \
@@ -534,11 +534,11 @@
 BLI_INLINE bNodeInstanceKey           BKE_node_instance_hash_iterator_get_key(bNodeInstanceHashIterator *iter) { return *(bNodeInstanceKey *)BLI_ghashIterator_getKey(iter); }
 BLI_INLINE void                      *BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); }
 BLI_INLINE void                       BKE_node_instance_hash_iterator_step(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_step(iter); }
-BLI_INLINE bool                       BKE_node_instance_hash_iterator_not_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_notDone(iter); }
+BLI_INLINE bool                       BKE_node_instance_hash_iterator_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_done(iter); }
 
 #define NODE_INSTANCE_HASH_ITER(iter_, hash_) \
 	for (BKE_node_instance_hash_iterator_init(&iter_, hash_); \
-	     BKE_node_instance_hash_iterator_not_done(&iter_); \
+	     BKE_node_instance_hash_iterator_done(&iter_) == false; \
 	     BKE_node_instance_hash_iterator_step(&iter_))
 
 

Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2013-05-08 12:58:11 UTC (rev 56561)
@@ -295,7 +295,7 @@
 						vi.mask = &vi.vmask[vi.vert_indices[vi.gx]]; \
 				} \
 				else { \
-					if (BLI_ghashIterator_notDone(&vi.bm_unique_verts)) {\
+					if (!BLI_ghashIterator_done(&vi.bm_unique_verts)) {\
 						vi.bm_vert = BLI_ghashIterator_getKey(&vi.bm_unique_verts); \
 						BLI_ghashIterator_step(&vi.bm_unique_verts); \
 					} \

Modified: trunk/blender/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -294,7 +294,7 @@
 
 	/* Build the vertex list, unique verts first */
 	for (iter = BLI_ghashIterator_new(map), i = 0;
-	     BLI_ghashIterator_notDone(iter);
+	     BLI_ghashIterator_done(iter) == false;
 	     BLI_ghashIterator_step(iter), ++i)
 	{
 		void *value = BLI_ghashIterator_getValue(iter);
@@ -1217,7 +1217,7 @@
 	faces = MEM_callocN(sizeof(void *) * tot, "PBVH Grid Faces");
 
 	for (hiter = BLI_ghashIterator_new(map), i = 0;
-	     BLI_ghashIterator_notDone(hiter);
+	     BLI_ghashIterator_done(hiter) == false;
 	     BLI_ghashIterator_step(hiter), ++i)
 	{
 		faces[i] = BLI_ghashIterator_getKey(hiter);

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -1034,7 +1034,7 @@
 
 	hash  = vertexowner->soft->scratch->colliderhash;
 	ihash =	BLI_ghashIterator_new(hash);
-	while (BLI_ghashIterator_notDone(ihash) ) {
+	while (!BLI_ghashIterator_done(ihash)) {
 
 		ccd_Mesh *ccdm = BLI_ghashIterator_getValue	(ihash);
 		ob             = BLI_ghashIterator_getKey	(ihash);
@@ -1113,7 +1113,7 @@
 
 	hash  = vertexowner->soft->scratch->colliderhash;
 	ihash =	BLI_ghashIterator_new(hash);
-	while (BLI_ghashIterator_notDone(ihash) ) {
+	while (!BLI_ghashIterator_done(ihash)) {
 
 		ccd_Mesh *ccdm = BLI_ghashIterator_getValue	(ihash);
 		ob             = BLI_ghashIterator_getKey	(ihash);
@@ -1205,7 +1205,7 @@
 
 	hash  = vertexowner->soft->scratch->colliderhash;
 	ihash =	BLI_ghashIterator_new(hash);
-	while (BLI_ghashIterator_notDone(ihash) ) {
+	while (!BLI_ghashIterator_done(ihash)) {
 
 		ccd_Mesh *ccdm = BLI_ghashIterator_getValue	(ihash);
 		ob             = BLI_ghashIterator_getKey	(ihash);
@@ -1433,7 +1433,7 @@
 
 	hash  = vertexowner->soft->scratch->colliderhash;
 	ihash =	BLI_ghashIterator_new(hash);
-	while (BLI_ghashIterator_notDone(ihash) ) {
+	while (!BLI_ghashIterator_done(ihash)) {
 
 		ccd_Mesh *ccdm = BLI_ghashIterator_getValue	(ihash);
 		ob             = BLI_ghashIterator_getKey	(ihash);
@@ -1763,7 +1763,7 @@
 	outerforceaccu[0]=outerforceaccu[1]=outerforceaccu[2]=0.0f;
 	innerforceaccu[0]=innerforceaccu[1]=innerforceaccu[2]=0.0f;
 /* go */
-	while (BLI_ghashIterator_notDone(ihash) ) {
+	while (!BLI_ghashIterator_done(ihash)) {
 
 		ccd_Mesh *ccdm = BLI_ghashIterator_getValue	(ihash);
 		ob             = BLI_ghashIterator_getKey	(ihash);

Modified: trunk/blender/source/blender/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h	2013-05-08 12:58:11 UTC (rev 56561)
@@ -132,11 +132,11 @@
  * \param ghi The iterator.
  * \return True if done, False otherwise.
  */
-bool            BLI_ghashIterator_notDone(GHashIterator *ghi);
+bool            BLI_ghashIterator_done(GHashIterator *ghi);
 
 #define GHASH_ITER(gh_iter_, ghash_)                                          \
 	for (BLI_ghashIterator_init(&gh_iter_, ghash_);                           \
-	     BLI_ghashIterator_notDone(&gh_iter_);                                \
+	     BLI_ghashIterator_done(&gh_iter_) == false;                          \
 	     BLI_ghashIterator_step(&gh_iter_))
 
 /* *** */

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -299,9 +299,9 @@
 		}
 	}
 }
-bool BLI_ghashIterator_notDone(GHashIterator *ghi)
+bool BLI_ghashIterator_done(GHashIterator *ghi)
 {
-	return ghi->curEntry != NULL;
+	return ghi->curEntry == NULL;
 }
 
 /***/

Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -896,7 +896,7 @@
 			/* look on deform bones first */
 			BLI_ghashIterator_init(&ghi, rg->bones_map);
 			
-			for (; BLI_ghashIterator_notDone(&ghi); BLI_ghashIterator_step(&ghi)) {
+			for (; !BLI_ghashIterator_done(&ghi); BLI_ghashIterator_step(&ghi)) {
 				EditBone *bone = (EditBone *)BLI_ghashIterator_getValue(&ghi);
 				
 				/* don't link with parent */

Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -183,7 +183,7 @@
 
 	BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
 
-	while (BLI_ghashIterator_notDone(&ghi)) {
+	while (!BLI_ghashIterator_done(&ghi)) {
 		Object *ob = BLI_ghashIterator_getValue(&ghi);
 		int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
 
@@ -203,7 +203,7 @@
 		GHashIterator ghi;
 		BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
 
-		while (BLI_ghashIterator_notDone(&ghi)) {
+		while (!BLI_ghashIterator_done(&ghi)) {
 			Object *ob = BLI_ghashIterator_getValue(&ghi);
 			int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
 

Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c	2013-05-08 12:57:18 UTC (rev 56560)
+++ trunk/blender/source/blender/editors/armature/reeb.c	2013-05-08 12:58:11 UTC (rev 56561)
@@ -1661,7 +1661,7 @@
 			float avg_vec[3] = {0, 0, 0};
 			
 			for (BLI_ghashIterator_init(&ghi, arc->faces);
-			     BLI_ghashIterator_notDone(&ghi);
+			     BLI_ghashIterator_done(&ghi) == false;
 			     BLI_ghashIterator_step(&ghi))
 			{
 				EditFace *efa = BLI_ghashIterator_getValue(&ghi);
@@ -2047,7 +2047,7 @@
 	GHashIterator ghi;
 	
 	for (BLI_ghashIterator_init(&ghi, aSrc->faces);
-	     BLI_ghashIterator_notDone(&ghi);
+	     BLI_ghashIterator_done(&ghi) == false;
 	     BLI_ghashIterator_step(&ghi))
 	{
 		EditFace *efa = BLI_ghashIterator_getValue(&ghi);

Modified: trunk/blender/source/blender/editors/curve/editcurve.c

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list