[Bf-blender-cvs] [0ddf3e110ef] master: Cleanup: comment blocks
Campbell Barton
noreply at git.blender.org
Sun Sep 2 10:46:11 CEST 2018
Commit: 0ddf3e110ef0f1f69ef785db867e581f813ee9a7
Author: Campbell Barton
Date: Sun Sep 2 18:51:31 2018 +1000
Branches: master
https://developer.blender.org/rB0ddf3e110ef0f1f69ef785db867e581f813ee9a7
Cleanup: comment blocks
===================================================================
M intern/ghost/intern/GHOST_Context.h
M intern/ghost/intern/GHOST_DropTargetWin32.cpp
M intern/ghost/intern/GHOST_System.h
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemX11.h
M intern/ghost/intern/GHOST_Window.h
M source/blender/blenkernel/BKE_constraint.h
M source/blender/blenkernel/intern/bvhutils.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/BLI_bitmap.h
M source/blender/blenlib/intern/DLRB_tree.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_interp.c
M source/blender/blenlib/intern/string_utils.c
M source/blender/blenlib/intern/task.c
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_private.h
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/operators/bmo_smooth_laplacian.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/ErrorHandler.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/collada/collada_utils.h
M source/blender/compositor/intern/COM_NodeConverter.h
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/armature/editarmature_retarget.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/gpencil/editaction_gpencil.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/mask/mask_editaction.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_random.c
M source/blender/editors/physics/dynamicpaint_ops.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/freestyle/intern/image/GaussianFilter.h
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/view_map/ViewMap.h
M source/blender/freestyle/intern/winged_edge/WEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdge.h
M source/blender/imbuf/intern/dds/ColorBlock.cpp
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/iris.c
M source/blender/imbuf/intern/tiff.c
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/RNA_define.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
M source/blender/python/generic/py_capi_utils.c
M source/blender/python/intern/gpu.c
M source/blender/python/mathutils/mathutils_Vector.c
M source/blender/render/intern/source/render_texture.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_jobs.c
M source/blender/windowmanager/wm_event_types.h
M source/creator/creator.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.h
index 18d36c40e9c..93c0f4620a1 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -112,9 +112,10 @@ public:
return GHOST_kFailure;
}
- /** Stereo visual created. Only necessary for 'real' stereo support,
- * ie quad buffered stereo. This is not always possible, depends on
- * the graphics h/w
+ /**
+ * Stereo visual created. Only necessary for 'real' stereo support,
+ * ie quad buffered stereo. This is not always possible, depends on
+ * the graphics h/w
*/
inline bool isStereoVisual() const {
return m_stereoVisual;
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
index de12dfad815..72463b456c6 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
@@ -60,7 +60,7 @@ GHOST_DropTargetWin32::~GHOST_DropTargetWin32()
/*
- * IUnknown::QueryInterface
+ * IUnknown::QueryInterface
*/
HRESULT __stdcall GHOST_DropTargetWin32::QueryInterface(REFIID riid, void **ppvObj)
{
@@ -82,7 +82,7 @@ HRESULT __stdcall GHOST_DropTargetWin32::QueryInterface(REFIID riid, void **ppvO
/*
- * IUnknown::AddRef
+ * IUnknown::AddRef
*/
ULONG __stdcall GHOST_DropTargetWin32::AddRef(void)
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 2fd8603516d..464d9269f28 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -184,7 +184,7 @@ public:
/**
* Inherited from GHOST_ISystem but left pure virtual
*
- * virtual bool processEvents(bool waitForEvent) = 0;
+ * virtual bool processEvents(bool waitForEvent) = 0;
*/
@@ -213,9 +213,12 @@ public:
* Cursor management functionality
***************************************************************************************/
- /** Inherited from GHOST_ISystem but left pure virtual
- * GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const = 0;
- * GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+ /**
+ * Inherited from GHOST_ISystem but left pure virtual
+ * <pre>
+ * GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const = 0;
+ * GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+ * </pre>
*/
/***************************************************************************************
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index ae4aae380c5..c2ad3b00352 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1332,9 +1332,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
break;
case WM_DPICHANGED:
/* The WM_DPICHANGED message is sent when the effective dots per inch (dpi) for a window has changed.
- * The DPI is the scale factor for a window. There are multiple events that can cause the DPI to
- * change such as when the window is moved to a monitor with a different DPI.
- */
+ * The DPI is the scale factor for a window. There are multiple events that can cause the DPI to
+ * change such as when the window is moved to a monitor with a different DPI.
+ */
{
WORD newYAxisDPI = HIWORD(wParam);
WORD newXAxisDPI = LOWORD(wParam);
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index ed1542ec490..3a65ff2a843 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -377,7 +377,7 @@ private:
char m_keyboard_vector[32];
/* to prevent multiple warp, we store the time of the last warp event
- * and stop accumulating all events generated before that */
+ * and stop accumulating all events generated before that */
Time m_last_warp;
/* detect autorepeat glitch */
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h
index e6a4682ee7c..59d3123b9de 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -296,9 +296,9 @@ public:
}
/**
- * Returns the recommended DPI for this window.
- * \return The recommended DPI for this window.
- */
+ * Returns the recommended DPI for this window.
+ * \return The recommended DPI for this window.
+ */
virtual inline GHOST_TUns16 getDPIHint()
{
return 96;
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 5e7a3f4af72..293ac30f0f9 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -66,16 +66,18 @@ typedef void (*ConstraintIDFunc)(struct bConstraint *con, struct ID **idpoin, bo
/* ....... */
-/* Constraint Type-Info (shorthand in code = cti):
- * This struct provides function pointers for runtime, so that functions can be
- * written more generally (with fewer/no special exceptions for various constraints).
+/**
+ * Constraint Type-Info (shorthand in code = cti):
+ * This struct provides function pointers for runtime, so that functions can be
+ * written more generally (with fewer/no special exceptions for various constraints).
*
- * Callers of these functions must check that they actually point to something useful,
- * as some constraints don't define some of these.
+ * Callers of these functions must check that they actually point to something useful,
+ * as some constraints don't define some of these.
*
- * Warning: it is not too advisable to reorder order of members of this struct,
- * as you'll have to edit quite a few ($NUM_CONSTRAINT_TYPES) of these
- * structs.
+ * Warning:
+ * it is not too advisable to reorder order of members of this struct,
+ * as you'll have to edit quite a few #NUM_CONSTRAINT_TYPES of these
+ * structs.
*/
typedef struct bConstraintTypeInfo {
/* admin/ident */
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index e48c6ff38d2..151d697d891 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -1097,7 +1097,7 @@ BVHTree *bvhtree_from_mesh_get(
int looptri_num = dm->getNumLoopTri(dm);
/* this assert checks we have looptris,
- * if not caller should use DM_ensure_looptri() */
+ * if not caller should use DM_ensure_looptri() */
BLI_assert(!(looptri_num == 0 && dm->getNumPolys(dm) != 0));
tree = bvhtree_from_mesh_looptri_create_tree(
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 26f998b3cb4..4597eb9b114 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -553,11 +553,11 @@ void cloth_free_modifier(ClothModifierData *clmd )
if (cloth->edgeset)
BLI_edgeset_free(cloth->edgeset);
-
- /*
- if (clmd->clothObject->facemarks)
- MEM_freeN(clmd->clothObject->facemarks);
- */
+#if 0
+ if (clmd->clothObject->facemarks) {
+ MEM_freeN(clmd->clothObject->facemarks);
+ }
+#endif
MEM_freeN ( cloth );
clmd->clothObject = NULL;
}
@@ -620,10 +620,11 @@ void cloth_free_modifier_extern(ClothModifierData *clmd )
BLI_edgeset_free(cloth->edgeset);
- /*
- if (clmd->clothObject->facemarks)
- MEM_freeN(clmd->clothObject->facemarks);
- */
+#if 0
+ if (clmd->clothObject->facemarks) {
+ MEM_freeN(clmd->clothObject->facemarks);
+ }
+#endif
MEM_freeN ( cloth );
clmd->clothObject = NULL;
}
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index ab5fe1d45f5..ed4ee1f8b17 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1373,7 +1373,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
}
/* also add number of vertices to temp_data
- * to locate points on "mesh edge" */
+ * to locate points on "mesh edge" */
for (i = 0; i < numOfPolys; i++) {
for (int j = 0; j < mpoly[i].totloop; j++) {
temp_data[mloop[mpoly[i].loopstart + j].v]++;
@@ -1381,7 +1381,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
}
/* now check if total number of edges+faces for
- * each vertex is even, if not -> vertex is on mesh edge */
+ * each vertex is even, if not -> vertex is on mesh edge */
for (i = 0; i < sData->total_points; i++) {
if ((temp_data[i] % 2) || (temp_data[i] < 4)) {
ad->flags[i] |= ADJ_ON_MESH_EDGE;
@@ -1415,7 +1415,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
}
else if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) {
/* for image sequences, only allocate memory.
- * bake initialization takes care of rest */
+ * bake initialization takes care of rest */
}
MEM_freeN(temp_data);
@@ -1583,7 +1583,7 @@ static void dynamicPaint_setInitialColor(const Scene *scene, DynamicPaintSurface
return;
/* for vertex surface loop through tfaces and find uv color
- * that provides highest alpha */
+ * that provides highest alpha */
if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
struct ImagePool *pool = BKE_image_pool_new();
@@ -2908,7 +2908,7 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface, flo
int cursor = 0;
/* Create a temporary array of final indexes (before unassigned
- * pixels have been dropped) */
+ * pixels have been dropped) */
for (int i = 0; i < w * h; i++) {
if (tempPoints[i].tri_index != -1) {
final_index[i] = cursor;
@@ -3458,9 +3458,9 @@ static void mesh_tris_spherecast_dp(void *userdata, int index, const BVHTreeRay
}
/* A modified callback to bvh tree nearest point. The tree must have been built using bvhtree_from_mesh_looptri.
- * userdata must be a BVHMeshCallbackUserdata built from the same mesh as the tree.
+ * userdata must be a BVHMeshCallbackUserdata built from the same mesh as the tree.
*
- * To optimize brush detection speed this doesn't calculate hit normal.
+ * T
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list