[Bf-blender-cvs] [5aa45c43f27] master: Cleanup: missing leading '*' from comment blocks
Campbell Barton
noreply at git.blender.org
Fri Jul 30 14:31:36 CEST 2021
Commit: 5aa45c43f278eb78a1f68d947590c43affe42df8
Author: Campbell Barton
Date: Fri Jul 30 22:20:13 2021 +1000
Branches: master
https://developer.blender.org/rB5aa45c43f278eb78a1f68d947590c43affe42df8
Cleanup: missing leading '*' from comment blocks
===================================================================
M intern/memutil/MEM_CacheLimiter.h
M source/blender/blenlib/BLI_inplace_priority_queue.hh
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/io/collada/Materials.cpp
M source/blender/windowmanager/intern/wm_splash_screen.c
===================================================================
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h
index 6ca61fbcde1..a8706454de8 100644
--- a/intern/memutil/MEM_CacheLimiter.h
+++ b/intern/memutil/MEM_CacheLimiter.h
@@ -299,9 +299,9 @@ template<class T> class MEM_CacheLimiter {
if (!can_destroy_element(elem))
continue;
- /* by default 0 means highest priority element */
- /* casting a size type to int is questionable,
- but unlikely to cause problems */
+ /* By default 0 means highest priority element. */
+ /* Casting a size type to int is questionable,
+ * but unlikely to cause problems. */
int priority = -((int)(queue.size()) - i - 1);
priority = item_priority_func(elem->get()->get_data(), priority);
diff --git a/source/blender/blenlib/BLI_inplace_priority_queue.hh b/source/blender/blenlib/BLI_inplace_priority_queue.hh
index e76cb8504a3..f0f0dd9b517 100644
--- a/source/blender/blenlib/BLI_inplace_priority_queue.hh
+++ b/source/blender/blenlib/BLI_inplace_priority_queue.hh
@@ -33,8 +33,8 @@ namespace blender {
template<
/* Type of the elements in the underlying array. */
typename T,
- /* Binary function that takes two `const T &` inputs and returns true, when the first input has
- greater priority than the second. */
+ /* Binary function that takes two `const T &` inputs and returns true,
+ * when the first input has greater priority than the second. */
typename FirstHasHigherPriority = std::greater<T>>
class InplacePriorityQueue {
private:
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index a07f924e65b..6b0b8e8df8f 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -1071,7 +1071,7 @@ void ui_draw_preview_item_stateless(const struct uiFontStyle *fstyle,
#define UI_TEXT_MARGIN_X 0.4f
#define UI_POPUP_MARGIN (UI_DPI_FAC * 12)
/* Margin at top of screen for popups. Note this value must be sufficient
- to draw a popover arrow to avoid cropping it. */
+ * to draw a popover arrow to avoid cropping it. */
#define UI_POPUP_MENU_TOP (int)(10 * UI_DPI_FAC)
#define UI_PIXEL_AA_JITTER 8
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index ea7bcf57f52..03c67e9b046 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5965,8 +5965,8 @@ uiLayout *uiItemsAlertBox(uiBlock *block, const int size, const eAlertIcon icon)
const int text_points_max = MAX2(style->widget.points, style->widgetlabel.points);
const int dialog_width = icon_size + (text_points_max * size * U.dpi_fac);
/* By default, the space between icon and text/buttons will be equal to the 'columnspace',
- this extra padding will add some space by increasing the left column width,
- making the icon placement more symmetrical, between the block edge and the text. */
+ * this extra padding will add some space by increasing the left column width,
+ * making the icon placement more symmetrical, between the block edge and the text. */
const float icon_padding = 5.0f * U.dpi_fac;
/* Calculate the factor of the fixed icon column depending on the block width. */
const float split_factor = ((float)icon_size + icon_padding) /
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index bcd945b21a9..d3481c449ac 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2292,7 +2292,7 @@ static void widget_draw_extra_icons(const uiWidgetColors *wcol,
const float icon_size = ICON_SIZE_FROM_BUTRECT(rect);
/* Offset of icons from the right edge. Keep in sync
- with 'ui_but_extra_operator_icon_mouse_over_get'. */
+ * with 'ui_but_extra_operator_icon_mouse_over_get'. */
if (!BLI_listbase_is_empty(&but->extra_op_icons)) {
/* Eyeballed. */
rect->xmax -= 0.2 * icon_size;
@@ -2481,8 +2481,8 @@ static void widget_draw_text_icon(const uiFontStyle *fstyle,
}
else {
/* In case a separate text label and some other button are placed under each other,
- and the outline of the button does not contrast with the background.
- Add an offset (thickness of the outline) so that the text does not stick out visually. */
+ * and the outline of the button does not contrast with the background.
+ * Add an offset (thickness of the outline) so that the text does not stick out visually. */
if (but->drawflag & UI_BUT_TEXT_LEFT) {
rect->xmin += U.pixelsize;
}
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index f052f1af104..411685bd921 100644
--- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
@@ -372,7 +372,7 @@ void gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, V
e = *itE;
/* Since this vertex passed the tests in gts_vertex_mean_curvature_normal(),
- this should be true. */
+ * this should be true. */
// g_assert(gts_edge_face_number (e, s) == 2);
/* Identify the two triangles bordering e in s. */
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 3a6d6a8f32f..06f5e12c891 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -380,7 +380,7 @@ static void lineart_occlusion_single_line(LineartRenderBuffer *rb, LineartEdge *
/* Ignore this triangle if an intersection line directly comes from it, */
lineart_occlusion_is_adjacent_intersection(e, (LineartTriangle *)tri) ||
/* Or if this triangle isn't effectively occluding anything nor it's providing a
- material flag. */
+ * material flag. */
((!tri->base.mat_occlusion) && (!tri->base.material_mask_bits))) {
continue;
}
diff --git a/source/blender/io/collada/Materials.cpp b/source/blender/io/collada/Materials.cpp
index ac4c65464c8..81f0cc608d2 100644
--- a/source/blender/io/collada/Materials.cpp
+++ b/source/blender/io/collada/Materials.cpp
@@ -411,10 +411,9 @@ void MaterialNode::set_specular(COLLADAFW::ColorOrTexture &cot)
if (!has_specularity) {
/* If specularity is black or not defined reset the Specular value to 0
- TODO: This is a solution only for a corner case. We must find a better
- way to handle specularity in general. Also note that currently we
- do not export specularity values, see EffectExporter::operator()
- */
+ * TODO: This is a solution only for a corner case. We must find a better
+ * way to handle specularity in general. Also note that currently we
+ * do not export specularity values, see EffectExporter::operator() */
bNodeSocket *socket = nodeFindSocket(shader_node, SOCK_IN, "Specular");
((bNodeSocketValueFloat *)socket->default_value)->value = 0.0f;
}
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c
index f5881a00998..99c6bc39207 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@ -238,8 +238,8 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void *UNUSE
if (!BLI_exists(userpref)) {
mt = WM_menutype_find("WM_MT_splash_quick_setup", true);
- /* The UI_BLOCK_QUICK_SETUP flag prevents the button text from being left-aligned,
- as it is for all menus due to the UI_BLOCK_LOOP flag, see in 'ui_def_but'. */
+ /* The #UI_BLOCK_QUICK_SETUP flag prevents the button text from being left-aligned,
+ * as it is for all menus due to the #UI_BLOCK_LOOP flag, see in #ui_def_but. */
UI_block_flag_enable(block, UI_BLOCK_QUICK_SETUP);
}
else {
More information about the Bf-blender-cvs
mailing list