[Bf-blender-cvs] [5cc8e7ab53c] master: Cleanup: reformat trailing comments that caused line wrapping
Campbell Barton
noreply at git.blender.org
Wed Jun 23 05:57:56 CEST 2021
Commit: 5cc8e7ab53cb20a64b8c14268fe2dba2396b4247
Author: Campbell Barton
Date: Wed Jun 23 12:05:40 2021 +1000
Branches: master
https://developer.blender.org/rB5cc8e7ab53cb20a64b8c14268fe2dba2396b4247
Cleanup: reformat trailing comments that caused line wrapping
===================================================================
M intern/cycles/util/util_color.h
M intern/cycles/util/util_system.cpp
M intern/ghost/intern/GHOST_XrAction.cpp
M intern/ghost/intern/GHOST_XrSession.h
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/curve_deform.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sound.c
M source/blender/bmesh/operators/bmo_fill_attribute.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_image/image_undo.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/transform/transform_convert_armature.c
M source/blender/imbuf/intern/dds/ColorBlock.cpp
M source/blender/io/collada/BCMath.cpp
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
===================================================================
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h
index 203c0b289f6..40c2c431aca 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -223,12 +223,14 @@ ccl_device_inline ssef fastpow24(const ssef &arg)
ssef x = fastpow<0x3F4CCCCD, 0x4F55A7FB>(arg); // error max = 0.17 avg = 0.0018 |avg| = 0.05
ssef arg2 = arg * arg;
ssef arg4 = arg2 * arg2;
- x = improve_5throot_solution(x,
- arg4); /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */
- x = improve_5throot_solution(x,
- arg4); /* error max = 0.00021 avg = 1.6e-05 |avg| = 1.6e-05 */
- x = improve_5throot_solution(x,
- arg4); /* error max = 6.1e-07 avg = 5.2e-08 |avg| = 1.1e-07 */
+
+ /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */
+ x = improve_5throot_solution(x, arg4);
+ /* error max = 0.00021 avg = 1.6e-05 |avg| = 1.6e-05 */
+ x = improve_5throot_solution(x, arg4);
+ /* error max = 6.1e-07 avg = 5.2e-08 |avg| = 1.1e-07 */
+ x = improve_5throot_solution(x, arg4);
+
return x * (x * x);
}
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 03bc5aea1dd..b010881058b 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -282,8 +282,8 @@ static CPUCapabilities &system_cpu_capabilities()
/* actual opcode for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0" : "=a"(xcr_feature_mask), "=d"(edx) : "c"(0));
# elif defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK)
- xcr_feature_mask = (uint32_t)_xgetbv(
- _XCR_XFEATURE_ENABLED_MASK); /* min VS2010 SP1 compiler is required */
+ /* Minimum VS2010 SP1 compiler is required. */
+ xcr_feature_mask = (uint32_t)_xgetbv(_XCR_XFEATURE_ENABLED_MASK);
# else
xcr_feature_mask = 0;
# endif
diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cpp
index 172ac40c84f..b10e001df47 100644
--- a/intern/ghost/intern/GHOST_XrAction.cpp
+++ b/intern/ghost/intern/GHOST_XrAction.cpp
@@ -392,9 +392,10 @@ GHOST_XrActionSet::GHOST_XrActionSet(XrInstance instance, const GHOST_XrActionSe
{
XrActionSetCreateInfo action_set_info{XR_TYPE_ACTION_SET_CREATE_INFO};
strcpy(action_set_info.actionSetName, info.name);
- strcpy(action_set_info.localizedActionSetName,
- info.name); /* Just use same name for localized. This can be changed in the future if
- necessary. */
+
+ /* Just use same name for localized. This can be changed in the future if necessary. */
+ strcpy(action_set_info.localizedActionSetName, info.name);
+
action_set_info.priority = 0; /* Use same (default) priority for all action sets. */
CHECK_XR(xrCreateActionSet(instance, &action_set_info, &m_action_set),
diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.h
index d09c78e1ea7..a2d3cf2e385 100644
--- a/intern/ghost/intern/GHOST_XrSession.h
+++ b/intern/ghost/intern/GHOST_XrSession.h
@@ -74,10 +74,11 @@ class GHOST_XrSession {
const GHOST_XrActionProfileInfo *infos);
bool attachActionSets();
- /** Action functions to be called post-session start. */
- bool syncActions(
- const char *action_set_name = nullptr); /* If action_set_name is nullptr, all attached
- * action sets will be synced. */
+ /**
+ * Action functions to be called post-session start.
+ * \param action_set_name: When `nullptr`, all attached action sets will be synced.
+ */
+ bool syncActions(const char *action_set_name = nullptr);
bool applyHapticAction(const char *action_set_name,
const char *action_name,
const GHOST_TInt64 &duration,
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 5db2eceb0d1..71d242e9c79 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -846,8 +846,9 @@ void BKE_pose_copy_data_ex(bPose **dst,
}
if (copy_constraints) {
- BKE_constraints_copy_ex(
- &listb, &pchan->constraints, flag, true); /* BKE_constraints_copy NULLs listb */
+ /* #BKE_constraints_copy NULL's `listb` */
+ BKE_constraints_copy_ex(&listb, &pchan->constraints, flag, true);
+
pchan->constraints = listb;
/* XXX: This is needed for motionpath drawing to work.
diff --git a/source/blender/blenkernel/intern/curve_deform.c b/source/blender/blenkernel/intern/curve_deform.c
index 10c6d2213ff..7deac4e4f19 100644
--- a/source/blender/blenkernel/intern/curve_deform.c
+++ b/source/blender/blenkernel/intern/curve_deform.c
@@ -173,12 +173,10 @@ static bool calc_curve_deform(
copy_qt_qt(quat, new_quat);
copy_v3_v3(cent, co);
- /* zero the axis which is not used,
- * the big block of text above now applies to these 3 lines */
- quat_apply_track(quat,
- axis,
- (ELEM(axis, 0, 2)) ? 1 :
- 0); /* up flag is a dummy, set so no rotation is done */
+ /* Zero the axis which is not used,
+ * the big block of text above now applies to these 3 lines.
+ * The `upflag` argument may be a dummy, set so no rotation is done. */
+ quat_apply_track(quat, axis, (ELEM(axis, 0, 2)) ? 1 : 0);
vec_apply_track(cent, axis);
cent[index] = 0.0f;
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 2e8f08519d2..553575b5c7b 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1615,8 +1615,9 @@ static void emit_from_particles(Object *flow_ob,
}
}
- state.time = BKE_scene_frame_get(
- scene); /* DEG_get_ctime(depsgraph) does not give subframe time */
+ /* `DEG_get_ctime(depsgraph)` does not give sub-frame time. */
+ state.time = BKE_scene_frame_get(scene);
+
if (psys_get_particle_state(&sim, p, &state, 0) == 0) {
continue;
}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 27222aeae4d..8cfd75b015c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -957,8 +957,8 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id)
ob, eModifierType_Fluidsim);
if (fluidmd && fluidmd->fss) {
- BLO_read_id_address(
- reader, ob->id.lib, &fluidmd->fss->ipo); /* XXX deprecated - old animation system */
+ /* XXX: deprecated - old animation system. */
+ BLO_read_id_address(reader, ob->id.lib, &fluidmd->fss->ipo);
}
}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 9381baa7506..021121034f1 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -384,8 +384,9 @@ void BKE_particle_partdeflect_blend_read_lib(BlendLibReader *reader, ID *id, Par
static void particle_settings_blend_read_lib(BlendLibReader *reader, ID *id)
{
ParticleSettings *part = (ParticleSettings *)id;
- BLO_read_id_address(
- reader, part->id.lib, &part->ipo); /* XXX deprecated - old animation system */
+
+ /* XXX: deprecated - old animation system. */
+ BLO_read_id_address(reader, part->id.lib, &part->ipo);
BLO_read_id_address(reader, part->id.lib, &part->instance_object);
BLO_read_id_address(reader, part->id.lib, &part->instance_collection);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2a5a2bf93a1..41f70db3fba 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1466,8 +1466,8 @@ static void scene_blend_read_lib(BlendLibReader *reader, ID *id)
IDP_BlendReadLib(reader, seq->prop);
if (seq->ipo) {
- BLO_read_id_address(
- reader, sce->id.lib, &seq->ipo); /* XXX deprecated - old animation system */
+ /* XXX: deprecated - old animation system. */
+ BLO_read_id_address(reader, sce->id.lib, &seq->ipo);
}
seq->scene_sound = NULL;
if (seq->scene) {
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 6dd1f66f6b5..f4a9d328d86 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -187,8 +187,8 @@ static void sound_blend_read_data(BlendDataReader *reader, ID *id)
static void sound_blend_read_lib(BlendLibReader *reader, ID *id)
{
bSound *sound = (bSound *)id;
- BLO_read_id_address(
- reader, sound->id.lib, &sound->ipo); /* XXX deprecated - old animation system */
+ /* XXX: deprecated - old animation system. */
+ BLO_read_id_address(reader, sound->id.lib, &sound->ipo);
}
static void sound_blend_read_expand(BlendExpander *expander, ID *id)
diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c
index 782fd98c2ea..e377fa6079b 100644
--- a/source/blender/bmesh/operators/bmo_fill_attribute.c
+++ b/source/blender/bmesh/operators/bmo_fill_attribute.c
@@ -154,8 +154,9 @@ void bmo_face_attribute_fill_exec(BMesh *bm, BMOperator *op)
int face_tot;
BM_mesh_elem_hflag_disable_all(bm, BM_FACE, BM_ELEM_TAG, false);
- BMO_slot_buffer_hflag_enable(
- bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false); /* do inline */
+
+ /* do inline */
+ BMO_slot_buffer_hflag_enable(bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false);
/* now we can copy adjacent data */
face_tot = bmesh_face_attribute_fill(bm, use_normals, use_data);
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 6c6fab13b7a..061fe0b07c5 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -3443,12 +3443,14 @@ static void ANIM_OT_channels_click(wmOperatorType *ot)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list