[Bf-blender-cvs] [58233e980ec] master: Cleanup: avoid adjacent C-style comments

Campbell Barton noreply at git.blender.org
Tue Apr 16 17:52:31 CEST 2019


Commit: 58233e980ec01a38267b78e4c6d191c7a4174df6
Author: Campbell Barton
Date:   Tue Apr 16 17:48:22 2019 +0200
Branches: master
https://developer.blender.org/rB58233e980ec01a38267b78e4c6d191c7a4174df6

Cleanup: avoid adjacent C-style comments

Causes clang-format to give different results on a second run.

===================================================================

M	source/blender/bmesh/tools/bmesh_wireframe.c
M	source/blender/makesdna/DNA_particle_types.h
M	source/blender/python/bmesh/bmesh_py_ops.c
M	source/blender/python/intern/bpy_library_load.c
M	source/blender/python/intern/bpy_rna.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c
index 10db05fad98..82fc4b2334e 100644
--- a/source/blender/bmesh/tools/bmesh_wireframe.c
+++ b/source/blender/bmesh/tools/bmesh_wireframe.c
@@ -329,7 +329,8 @@ void BM_mesh_wireframe(
 		}
 
 		BM_ITER_ELEM (l, &itersub, f_src, BM_LOOPS_OF_FACE) {
-			BM_elem_index_set(l, verts_loop_tot); /* set_dirty */  /* Because some faces might be skipped! */
+			/* Because some faces might be skipped! */
+			BM_elem_index_set(l, verts_loop_tot); /* set_dirty */
 
 			BM_loop_calc_face_tangent(l, tvec);
 
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index ae677a93c43..a6ad651b5d7 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -407,7 +407,8 @@ typedef enum eParticleDrawFlag {
 	PART_DRAW_GLOBAL_OB	    = (1 << 1),
 	PART_DRAW_SIZE          = (1 << 2),
 #ifdef DNA_DEPRECATED
-	PART_DRAW_EMITTER       = (1 << 3),  /* render emitter also */ /* DEPRECATED */
+	/** Render emitter as well. */
+	PART_DRAW_EMITTER       = (1 << 3), /* DEPRECATED */
 #endif
 	PART_DRAW_HEALTH        = (1 << 4),
 	PART_ABS_PATH_TIME      = (1 << 5),
diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c
index f35bfb730ad..fe82f22ec8c 100644
--- a/source/blender/python/bmesh/bmesh_py_ops.c
+++ b/source/blender/python/bmesh/bmesh_py_ops.c
@@ -312,8 +312,8 @@ static PyTypeObject bmesh_ops_fakemod_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */		/* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 	0,
diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c
index 77fb6bf1525..3a4c70c1873 100644
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -131,8 +131,8 @@ static PyTypeObject bpy_lib_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */		/* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 	0,
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index d9052aafae8..71d46de1be8 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -6337,8 +6337,8 @@ PyTypeObject pyrna_prop_array_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */ /* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
@@ -6420,8 +6420,8 @@ PyTypeObject pyrna_prop_collection_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */      /* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
@@ -6505,8 +6505,8 @@ static PyTypeObject pyrna_prop_collection_idprop_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */      /* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
@@ -6690,8 +6690,8 @@ static PyTypeObject pyrna_prop_collection_iter_Type = {
 	NULL,                       /* inquiry tp_clear; */
 
 	/***  Assigned meaning in release 2.1 ***/
-	/*** rich comparisons ***/
-	NULL, /* subclassed */      /* richcmpfunc tp_richcompare; */
+	/*** rich comparisons (subclassed) ***/
+	NULL, /* richcmpfunc tp_richcompare; */
 
 	/***  weak reference enabler ***/
 #ifdef USE_WEAKREFS



More information about the Bf-blender-cvs mailing list