[Bf-blender-cvs] [3c1433b6f3b] master: Revert "Cleanup: use doxy sections"
Campbell Barton
noreply at git.blender.org
Tue Mar 17 13:54:11 CET 2020
Commit: 3c1433b6f3b29e5c651dd7103bd6e44aef103fb5
Author: Campbell Barton
Date: Tue Mar 17 23:45:59 2020 +1100
Branches: master
https://developer.blender.org/rB3c1433b6f3b29e5c651dd7103bd6e44aef103fb5
Revert "Cleanup: use doxy sections"
This reverts commit 626b2bd071b334201996081b907e18d9c2dee919.
Sergey prefers not to use doxy sections for this code.
Revert pending a decision on T74845
===================================================================
M source/blender/blenkernel/intern/multires_reshape.h
M source/blender/blenkernel/intern/multires_reshape_util.c
===================================================================
diff --git a/source/blender/blenkernel/intern/multires_reshape.h b/source/blender/blenkernel/intern/multires_reshape.h
index 9029d19ae88..bdadc1f2800 100644
--- a/source/blender/blenkernel/intern/multires_reshape.h
+++ b/source/blender/blenkernel/intern/multires_reshape.h
@@ -132,9 +132,9 @@ typedef struct ReshapeConstGridElement {
float mask;
} ReshapeConstGridElement;
-/* -------------------------------------------------------------------- */
-/** \name Construct/destruct reshape context.
- * \{ */
+/* ================================================================================================
+ * Construct/destruct reshape context.
+ */
/* Create subdivision surface descriptor which is configured for surface evaluation at a given
* multires modifier. */
@@ -159,11 +159,9 @@ bool multires_reshape_context_create_from_subdivide(MultiresReshapeContext *resh
void multires_reshape_context_free(MultiresReshapeContext *reshape_context);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Helper accessors.
- * \{ */
+/* ================================================================================================
+ * Helper accessors.
+ */
/* For the given grid index get index of face it was created for. */
int multires_reshape_grid_to_face_index(const MultiresReshapeContext *reshape_context,
@@ -206,11 +204,9 @@ ReshapeGridElement multires_reshape_grid_element_for_ptex_coord(
ReshapeConstGridElement multires_reshape_orig_grid_element_for_grid_coord(
const MultiresReshapeContext *reshape_context, const GridCoord *grid_coord);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Sample limit surface of the base mesh.
- * \{ */
+/* ================================================================================================
+ * Sample limit surface of the base mesh.
+ */
/* Evaluate limit surface created from base mesh.
* This is the limit surface which defines tangent space for MDisps. */
@@ -219,20 +215,16 @@ void multires_reshape_evaluate_limit_at_grid(const MultiresReshapeContext *resha
float r_P[3],
float r_tangent_matrix[3][3]);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Custom data preparation.
- * \{ */
+/* ================================================================================================
+ * Custom data preparation.
+ */
/* Make sure custom data is allocated for the given level. */
void multires_reshape_ensure_grids(struct Mesh *mesh, const int level);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Functions specific to reshaping from a set of vertices in a object position.
- * \{ */
+/* ================================================================================================
+ * Functions specific to reshaping from a set of vertices in a object position.
+ */
/* Returns truth if all coordinates were assigned.
*
@@ -243,11 +235,9 @@ bool multires_reshape_assign_final_coords_from_vertcos(
const float (*vert_coords)[3],
const int num_vert_coords);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Functions specific to reshaping from CCG.
- * \{ */
+/* ================================================================================================
+ * Functions specific to reshaping from CCG.
+ */
/* NOTE: Displacement grids to be at least at a reshape level.
*
@@ -255,11 +245,9 @@ bool multires_reshape_assign_final_coords_from_vertcos(
bool multires_reshape_assign_final_coords_from_ccg(const MultiresReshapeContext *reshape_context,
struct SubdivCCG *subdiv_ccg);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Functions specific to reshaping from MDISPS.
- * \{ */
+/* ================================================================================================
+ * Functions specific to reshaping from MDISPS.
+ */
/* Reads and writes to the current mesh CD_MDISPS. */
void multires_reshape_assign_final_coords_from_mdisps(
@@ -269,11 +257,9 @@ void multires_reshape_assign_final_coords_from_mdisps(
void multires_reshape_assign_final_coords_from_orig_mdisps(
const MultiresReshapeContext *reshape_context);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Displacement smooth.
- * \{ */
+/* ================================================================================================
+ * Displacement smooth.
+ */
/* Operates on a displacement grids (CD_MDISPS) which contains object space coordinates stored for
* the reshape level.
@@ -290,11 +276,9 @@ void multires_reshape_smooth_object_grids_with_details(
*/
void multires_reshape_smooth_object_grids(const MultiresReshapeContext *reshape_context);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Displacement, space conversion.
- * \{ */
+/* ================================================================================================
+ * Displacement, space conversion.
+ */
/* Store original grid data, so then it's possible to calculate delta from it and add
* high-frequency content on top of reshaped grids. */
@@ -303,11 +287,9 @@ void multires_reshape_store_original_grids(MultiresReshapeContext *reshape_conte
void multires_reshape_object_grids_to_tangent_displacement(
const MultiresReshapeContext *reshape_context);
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Apply base.
- * \{ */
+/* ================================================================================================
+ * Apply base.
+ */
/* Update mesh coordinates to the final positions of displacement in object space.
* This is effectively desired position of base mesh vertices after canceling out displacement.
@@ -322,6 +304,4 @@ void multires_reshape_apply_base_refit_base_mesh(MultiresReshapeContext *reshape
/* Refine subdivision surface to the new positions of the base mesh. */
void multires_reshape_apply_base_refine_subdiv(MultiresReshapeContext *reshape_context);
-/** \} */
-
#endif /* __BKE_INTERN_MULTIRES_RESHAPE_H__ */
diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c
index a916a8b87c6..175b0ee9187 100644
--- a/source/blender/blenkernel/intern/multires_reshape_util.c
+++ b/source/blender/blenkernel/intern/multires_reshape_util.c
@@ -43,9 +43,9 @@
#include "DEG_depsgraph_query.h"
-/* -------------------------------------------------------------------- */
-/** \name Construct/destruct reshape context.
- * \{ */
+/* ================================================================================================
+ * Construct/destruct reshape context.
+ */
/* Create subdivision surface descriptor which is configured for surface evaluation at a given
* multires modifier. */
@@ -269,11 +269,9 @@ void multires_reshape_context_free(MultiresReshapeContext *reshape_context)
MEM_freeN(reshape_context->grid_to_face_index);
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Helper accessors.
- * \{ */
+/* ================================================================================================
+ * Helper accessors.
+ */
/* For the given grid index get index of face it was created for. */
int multires_reshape_grid_to_face_index(const MultiresReshapeContext *reshape_context,
@@ -447,11 +445,9 @@ ReshapeConstGridElement multires_reshape_orig_grid_element_for_grid_coord(
return grid_element;
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Sample limit surface of the base mesh.
- * \{ */
+/* ================================================================================================
+ * Sample limit surface of the base mesh.
+ */
void multires_reshape_evaluate_limit_at_grid(const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
@@ -471,11 +467,9 @@ void multires_reshape_evaluate_limit_at_grid(const MultiresReshapeContext *resha
reshape_context, face_index, corner, dPdu, dPdv, r_tangent_matrix);
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Custom data preparation.
- * \{ */
+/* ================================================================================================
+ * Custom data preparation.
+ */
static void allocate_displacement_grid(MDisps *displacement_grid, const int level)
{
@@ -537,11 +531,9 @@ void multires_reshape_ensure_grids(Mesh *mesh, const int level)
ensure_mask_grids(mesh, level);
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Displacement, space conversion.
- * \{ */
+/* ================================================================================================
+ * Displacement, space conversion.
+ */
void multires_reshape_store_original_grids(MultiresReshapeContext *reshape_context)
{
@@ -678,13 +670,10 @@ void multires_reshape_object_grids_to_tangent_displacement(
NULL);
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name MDISPS.
- * \{ */
-
-/* TODO(sergey): Make foreach_grid_coordinate more accessible and move this functionality to
+/* ================================================================================================
+ * MDISPS
+ *
+ * TODO(sergey): Make foreach_grid_coordinate more accessible and move this functionality to
* own file. */
static void assign_final_coords_from_mdisps(const MultiresReshapeContext *reshape_context,
@@ -735,5 +724,3 @@ void multires_reshape_assign_final_coords_from_orig_mdisps(
foreach_grid_coordinate(
reshape_context, r
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list