[Bf-blender-cvs] [333cdbb4102] master: Cleanup: comment blocks
Campbell Barton
noreply at git.blender.org
Thu Apr 18 08:05:31 CEST 2019
Commit: 333cdbb41025db012239e0549a439515880aad9b
Author: Campbell Barton
Date: Thu Apr 18 07:21:26 2019 +0200
Branches: master
https://developer.blender.org/rB333cdbb41025db012239e0549a439515880aad9b
Cleanup: comment blocks
===================================================================
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/font.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/tracking_auto.c
M source/blender/blenlib/BLI_assert.h
M source/blender/blenlib/PIL_time.h
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/bmesh/bmesh_class.h
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_private.h
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationImporter.cpp
M source/blender/collada/ArmatureExporter.cpp
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/BCAnimationCurve.cpp
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/collada/BCAnimationSampler.h
M source/blender/collada/BCSampleData.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/modes/edit_mesh_mode_text.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_clip/tracking_ops_plane.c
M source/blender/editors/space_clip/tracking_ops_track.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/undo/ed_undo.c
M source/blender/freestyle/intern/geometry/matrix_util.h
M source/blender/freestyle/intern/stroke/StrokeRep.h
M source/blender/gpu/GPU_legacy_stubs.h
M source/blender/gpu/intern/gpu_immediate.c
M source/blender/gpu/intern/gpu_matrix.c
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/dds/BlockDXT.cpp
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/indexer.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/thumbs.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_light_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_world_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/nodes/composite/nodes/node_composite_bokehimage.c
M source/blender/physics/intern/ConstrainedConjugateGradient.h
M source/blender/physics/intern/implicit_blender.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/source/imagetexture.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 88035e2b3d9..e4dc8ffae02 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -61,14 +61,18 @@ extern const CustomData_MeshMasks CD_MASK_EVERYTHING;
* memory space for totelem elements. mask must be an array of length
* CD_NUMTYPES elements, that indicate if a layer can be copied. */
-/* add/copy/merge allocation types */
+/** Add/copy/merge allocation types. */
typedef enum eCDAllocType {
- CD_ASSIGN = 0, /* use the data pointer */
- CD_CALLOC = 1, /* allocate blank memory */
- CD_DEFAULT = 2, /* allocate and set to default */
- CD_REFERENCE = 3, /* use data pointers, set layer flag NOFREE */
- CD_DUPLICATE = 4, /* do a full copy of all layers, only allowed if source
- * has same number of elements */
+ /** Use the data pointer. */
+ CD_ASSIGN = 0,
+ /** Allocate blank memory. */
+ CD_CALLOC = 1,
+ /** Allocate and set to default. */
+ CD_DEFAULT = 2,
+ /** Use data pointers, set layer flag NOFREE. */
+ CD_REFERENCE = 3,
+ /** Do a full copy of all layers, only allowed if source has same number of elements. */
+ CD_DUPLICATE = 4,
} eCDAllocType;
#define CD_TYPE_AS_MASK(_type) (CustomDataMask)((CustomDataMask)1 << (CustomDataMask)(_type))
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 68ef413b198..5b6f3cf17c4 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -110,13 +110,16 @@ typedef void (*TexWalkFunc)(void *userData,
const char *propname);
typedef enum ModifierApplyFlag {
- MOD_APPLY_RENDER = 1 << 0, /* Render time. */
- MOD_APPLY_USECACHE = 1 << 1, /* Result of evaluation will be cached, so modifier might
- * want to cache data for quick updates (used by subsurf) */
- MOD_APPLY_ORCO = 1 << 2, /* Modifier evaluated for undeformed texture coordinates */
- MOD_APPLY_IGNORE_SIMPLIFY = 1 << 3, /* Ignore scene simplification flag and use subdivisions
- * level set in multires modifier.
- */
+ /** Render time. */
+ MOD_APPLY_RENDER = 1 << 0,
+ /** Result of evaluation will be cached, so modifier might
+ * want to cache data for quick updates (used by subsurf) */
+ MOD_APPLY_USECACHE = 1 << 1,
+ /** Modifier evaluated for undeformed texture coordinates */
+ MOD_APPLY_ORCO = 1 << 2,
+ /** Ignore scene simplification flag and use subdivisions
+ * level set in multires modifier. */
+ MOD_APPLY_IGNORE_SIMPLIFY = 1 << 3,
} ModifierApplyFlag;
typedef struct ModifierUpdateDepsgraphContext {
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index de92077b052..785c3eedcfc 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3777,10 +3777,10 @@ void BKE_animsys_evaluate_all_animation(Main *main,
printf("Evaluate all animation - %f\n", ctime);
/* macros for less typing
- * - only evaluate animation data for id if it has users (and not just fake ones)
- * - whether animdata exists is checked for by the evaluation function, though taking
- * this outside of the function may make things slightly faster?
- */
+ * - only evaluate animation data for id if it has users (and not just fake ones)
+ * - whether animdata exists is checked for by the evaluation function, though taking
+ * this outside of the function may make things slightly faster?
+ */
#define EVAL_ANIM_IDS(first, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@@ -3791,11 +3791,11 @@ void BKE_animsys_evaluate_all_animation(Main *main,
(void)0
/* another macro for the "embedded" nodetree cases
- * - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
- * (i.e. scene/material/texture->nodetree) which we need a special exception
- * for, otherwise they'd get skipped
- * - ntp = "node tree parent" = datablock where node tree stuff resides
- */
+ * - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
+ * (i.e. scene/material/texture->nodetree) which we need a special exception
+ * for, otherwise they'd get skipped
+ * - ntp = "node tree parent" = datablock where node tree stuff resides
+ */
#define EVAL_ANIM_NODETREE_IDS(first, NtId_Type, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@@ -3906,9 +3906,9 @@ void BKE_animsys_eval_animdata(Depsgraph *depsgraph, ID *id)
{
float ctime = DEG_get_ctime(depsgraph);
AnimData *adt = BKE_animdata_from_id(id);
- Scene *scene = NULL; /* XXX: this is only needed for flushing RNA updates,
- * which should get handled as part of the dependency graph instead...
- */
+ /* XXX: this is only needed for flushing RNA updates,
+ * which should get handled as part of the dependency graph instead. */
+ Scene *scene = NULL;
DEG_debug_print_eval_time(depsgraph, __func__, id->name, id, ctime);
BKE_animsys_evaluate_animdata(depsgraph, scene, id, adt, ctime, ADT_RECALC_ANIM);
}
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 9f25cd14499..3062c4d52fa 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -713,7 +713,7 @@ static float cloth_shrink_factor(ClothModifierData *clmd, ClothVertex *verts, in
float k2 = base + delta * verts[i2].shrink_factor;
/* Use geometrical mean to average two factors since it behaves better
- for diagonals when a rectangle transforms into a trapezoid. */
+ * for diagonals when a rectangle transforms into a trapezoid. */
return sqrtf(k1 * k2);
}
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 67e1f36b222..41dc82cf05f 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -73,8 +73,8 @@ typedef struct SelfColDetectData {
} SelfColDetectData;
/***********************************
-Collision modifier code start
-***********************************/
+ * Collision modifier code start
+ ***********************************/
/* step is limited from 0 (frame start position) to 1 (frame end position) */
void collision_move_object(CollisionModifierData *collmd, float step, float prevstep)
@@ -178,9 +178,9 @@ void bvhtree_update_from_mvert(BVHTree *bvhtree,
BLI_bvhtree_update_tree(bvhtree);
}
-/***********************************
-Collision modifier code end
-***********************************/
+/* ***************************
+ * Collision modifier code end
+ * *************************** */
BLI_INLINE int next_ind(int i)
{
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 7769f3aff86..c0effb1cb32 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -1192,7 +1192,7 @@ static bool data_transfer_layersmapping_vgroups_multisrc_to_dst(ListBase *r_map,
}
if (r_map) {
/* At this stage, we **need** a valid CD_MDEFORMVERT layer on dest!
- * use_create is not relevant in this case */
+ * use_create is not relevant in this case */
if (!data_dst) {
data_dst = CustomData_add_layer(cd_dst, CD_MDEFORMVERT, CD_CALLOC, NULL, num_elem_dst);
}
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 4311402ef42..ffb3bad12e6 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -669,7 +669,7 @@ enum {
* And in some cases it is even the same value as FT_Face->bbox.yMax/yMin (font top and bottom respectively).
*
* The em_height here is relative to FT_Face->bbox.
-*/
+ */
#define ASCENT(vfd) ((vfd)->ascender * (vfd)->em_height)
#define DESCENT(vfd) ((vfd)->em_height - ASCENT(vfd))
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index c2c8fb78a32..46315e1bc9a 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -852,10 +852,10 @@ static const char *particle_adrcodes_to_paths(int adrcode, int *array_index)
return "settings.billboard_tilt";
/* PartDeflect needs to be sorted out properly in rna_object_force;
- * If anyone else works on this, but is unfamiliar, these particular
- * settings reference the particles of the system themselves
- * being used as forces -- it will use the same rna structure
- * as the similar object forces */
+ * If anyone else works on this, but is unfamiliar, these particular
+ * settings reference the particles of the system themselves
+ * being used as forces -- it will use the same rna structure
+ * as the similar object forces */
#if 0
case PART_PD_FSTR:
if (part->pd)
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index ee6faeaee3d..45bade78207 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2188,10 +2188,10 @@ static bNodeSocket *make_socket_interface(bNodeTree *ntree,
BLI_snprintf(sock->identifier, MAX_NAME, "Output_%d", own_index);
#ifdef USE_NODE_COMPAT_CUSTOMNODES
/* XXX forward compatibility:
- * own_index is deprecated, but needs to be set here.
- * Node sockets generally use the identifier string instead now,
- * but reconstructing own_index in writefile.c would require parsing the identifier string.
- */
+ * own_index is deprecated, but needs to be set here.
+ * Node sockets generally use the identifier string instead now,
+ * but reconstructing own_index in writefile.c would require parsing the identifier string.
+ */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list