Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-10-14 07:24:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-14 07:24:42 +0300
commitc7cd74fac3c47ce0c449ba5f2d130c6309242431 (patch)
tree169a1bae049af2e9cd5c4a6eeaa4c2db6694ea44 /source
parent863b38d7081673c41f343d28aa64c65f6cc41f96 (diff)
Cleanup: multi-line comment blocks
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/BLI_vector.hh2
-rw-r--r--source/blender/blenlib/intern/math_boolean.cc2
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.h8
-rw-r--r--source/blender/draw/engines/eevee/eevee_renderpasses.c4
-rw-r--r--source/blender/editors/animation/keyframes_general.c2
-rw-r--r--source/blender/editors/gpencil/annotate_paint.c6
-rw-r--r--source/blender/editors/gpencil/gpencil_paint.c3
-rw-r--r--source/blender/editors/sculpt_paint/paint_stroke.c4
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_intern.h2
-rw-r--r--source/blender/editors/space_node/node_group.c24
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c4
-rw-r--r--source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl2
-rw-r--r--source/blender/io/collada/BlenderContext.cpp2
-rw-r--r--source/blender/makesdna/DNA_cloth_types.h4
-rw-r--r--source/blender/makesdna/DNA_layer_types.h2
-rw-r--r--source/blender/makesdna/DNA_sound_types.h6
-rw-r--r--source/blender/makesrna/intern/rna_attribute.c8
-rw-r--r--source/blender/python/generic/py_capi_utils.c2
-rw-r--r--source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c2
20 files changed, 47 insertions, 44 deletions
diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh
index 3c90e1ab755..053dcb6faea 100644
--- a/source/blender/blenlib/BLI_vector.hh
+++ b/source/blender/blenlib/BLI_vector.hh
@@ -186,7 +186,7 @@ class Vector {
template<typename InputIt,
/* This constructor should not be called with e.g. Vector(3, 10), because that is
- expected to produce the vector (10, 10, 10). */
+ * expected to produce the vector (10, 10, 10). */
typename std::enable_if_t<!std::is_convertible_v<InputIt, int>> * = nullptr>
Vector(InputIt first, InputIt last, Allocator allocator = {})
: Vector(NoExceptConstructor(), allocator)
diff --git a/source/blender/blenlib/intern/math_boolean.cc b/source/blender/blenlib/intern/math_boolean.cc
index f7454a713a1..f8bf8676f50 100644
--- a/source/blender/blenlib/intern/math_boolean.cc
+++ b/source/blender/blenlib/intern/math_boolean.cc
@@ -123,7 +123,7 @@ namespace robust_pred {
* Since this is C++, an instantiated singleton class is used to make
* sure that #exactinit() is called once.
* (Because it's undefined when this is called in initialization of all modules,
- other modules shouldn't use these functions in initialization.)
+ * other modules shouldn't use these functions in initialization.)
*/
void exactinit();
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index d9324729560..0ce7c1389bd 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -51,20 +51,20 @@ class NodeOperationOutput;
*/
typedef enum InputResizeMode {
/** \brief Center the input image to the center of the working area of the node, no resizing
- occurs */
+ * occurs */
COM_SC_CENTER = NS_CR_CENTER,
/** \brief The bottom left of the input image is the bottom left of the working area of the node,
- no resizing occurs */
+ * no resizing occurs */
COM_SC_NO_RESIZE = NS_CR_NONE,
/** \brief Fit the width of the input image to the width of the working area of the node */
COM_SC_FIT_WIDTH = NS_CR_FIT_WIDTH,
/** \brief Fit the height of the input image to the height of the working area of the node */
COM_SC_FIT_HEIGHT = NS_CR_FIT_HEIGHT,
/** \brief Fit the width or the height of the input image to the width or height of the working
- area of the node, image will be larger than the working area */
+ * area of the node, image will be larger than the working area */
COM_SC_FIT = NS_CR_FIT,
/** \brief Fit the width and the height of the input image to the width and height of the working
- area of the node, image will be equally larger than the working area */
+ * area of the node, image will be equally larger than the working area */
COM_SC_STRETCH = NS_CR_STRETCH,
} InputResizeMode;
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c
index 8ec823879ad..be73225b348 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.c
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c
@@ -367,8 +367,8 @@ void EEVEE_renderpasses_draw(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
EEVEE_EffectsInfo *effects = stl->effects;
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
- /* We can only draw a single renderpass. Lightpasses also select their color pass (a second
- pass). We mask the light pass when a light pass is selected. */
+ /* We can only draw a single renderpass. Lightpasses also select their color pass
+ * (a second pass). We mask the light pass when a light pass is selected. */
const eViewLayerEEVEEPassType render_pass =
((stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) != 0) ?
(stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) :
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index f916969c9f3..08b02020f76 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -390,7 +390,7 @@ static void decimate_fcurve_segment(FCurve *fcu,
BKE_curve_decimate_bezt_array(&fcu->bezt[bezt_segment_start_idx],
bezt_segment_len,
12, /* The actual resolution displayed in the viewport is dynamic
- so we just pick a value that preserves the curve shape. */
+ * so we just pick a value that preserves the curve shape. */
false,
SELECT,
BEZT_FLAG_TEMP_TAG,
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 7cea221568e..c06a2f06a98 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -2090,7 +2090,7 @@ static void annotation_draw_apply_event(
else {
p->straight[0] = 0;
/* We were using shift while having permanent stabilization active,
- so activate the temp flag back again. */
+ * so activate the temp flag back again. */
if (p->flags & GP_PAINTFLAG_USE_STABILIZER) {
if ((p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) == 0) {
annotation_draw_toggle_stabilizer_cursor(p, true);
@@ -2098,8 +2098,8 @@ static void annotation_draw_apply_event(
}
}
/* We are using the temporal stabilizer flag atm,
- but shift is not pressed as well as the permanent flag is not used,
- so we don't need the cursor anymore. */
+ * but shift is not pressed as well as the permanent flag is not used,
+ * so we don't need the cursor anymore. */
else if (p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) {
/* Reset temporal stabilizer flag and remove cursor. */
p->flags &= ~GP_PAINTFLAG_USE_STABILIZER_TEMP;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index fb24c64f2bd..543ff8e7e9a 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -3471,8 +3471,7 @@ static void gpencil_add_fake_points(const wmEvent *event, tGPsdata *p)
(p->brush && (p->brush->gpencil_tool == GPAINT_TOOL_DRAW)));
/* TODO: ensure sampling enough points when using circular guide,
- but the arc must be around the center. (see if above to check other guides only)
- */
+ * but the arc must be around the center. (see if above to check other guides only). */
if (is_speed_guide && (guide->type == GP_GUIDE_CIRCULAR)) {
input_samples = GP_MAX_INPUT_SAMPLES;
}
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index ac1e5564f20..21b33a4e2ab 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -698,8 +698,8 @@ static float paint_space_stroke_spacing(bContext *C,
if (SCULPT_is_cloth_deform_brush(brush)) {
/* The spacing in tools that use the cloth solver should not be affected by the brush radius to
* avoid affecting the simulation update rate when changing the radius of the brush.
- With a value of 100 and the brush default of 10 for spacing, a simulation step runs every 2
- pixels movement of the cursor. */
+ * With a value of 100 and the brush default of 10 for spacing, a simulation step runs every 2
+ * pixels movement of the cursor. */
size_clamp = 100.0f;
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index a690e426770..41982a441ad 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -415,7 +415,7 @@ BLI_INLINE bool SCULPT_is_cloth_deform_brush(const Brush *brush)
BRUSH_CLOTH_DEFORM_GRAB,
BRUSH_CLOTH_DEFORM_SNAKE_HOOK)) ||
/* All brushes that are not the cloth brush deform the simulation using softbody
- constriants instead of applying forces. */
+ * constraints instead of applying forces. */
(brush->sculpt_tool != SCULPT_TOOL_CLOTH &&
brush->deform_target == BRUSH_DEFORM_TARGET_CLOTH_SIM);
}
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index 742d577ccf8..f376ff984ad 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -326,12 +326,14 @@ static int node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode)
/* if group output is not externally linked,
* convert the constant input value to ensure somewhat consistent behavior */
if (num_external_links == 0) {
- /* XXX TODO bNodeSocket *sock = node_group_find_input_socket(gnode, identifier);
- BLI_assert(sock);*/
-
- /* XXX TODO
- * nodeSocketCopy(ntree, link->tosock->new_sock, link->tonode->new_node,
- * ntree, sock, gnode);*/
+ /* TODO */
+#if 0
+ bNodeSocket *sock = node_group_find_input_socket(gnode, identifier);
+ BLI_assert(sock);
+
+ nodeSocketCopy(
+ ntree, link->tosock->new_sock, link->tonode->new_node, ntree, sock, gnode);
+#endif
}
}
}
@@ -359,11 +361,13 @@ static int node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode)
/* if group output is not internally linked,
* convert the constant output value to ensure somewhat consistent behavior */
if (num_internal_links == 0) {
- /* XXX TODO bNodeSocket *sock = node_group_find_output_socket(gnode, identifier);
- BLI_assert(sock);*/
+ /* TODO */
+#if 0
+ bNodeSocket *sock = node_group_find_output_socket(gnode, identifier);
+ BLI_assert(sock);
- /* XXX TODO
- * nodeSocketCopy(ntree, link->tosock, link->tonode, ntree, sock, gnode); */
+ nodeSocketCopy(ntree, link->tosock, link->tonode, ntree, sock, gnode);
+#endif
}
}
}
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 7e450af4802..3357b0b7346 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1791,7 +1791,7 @@ static bool outliner_id_operation_item_poll(bContext *C,
return true;
}
/* TODO(dalai): enable in the few cases where this can be supported
- (i.e., when we have a valid parent for the tselem). */
+ * (i.e., when we have a valid parent for the tselem). */
return false;
}
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 0d350d0e7d4..b05ff207e82 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1782,8 +1782,8 @@ bool ED_view3d_is_region_xr_mirror_active(const wmWindowManager *wm,
const ARegion *region)
{
return (v3d->flag & V3D_XR_SESSION_MIRROR) &&
- /* The free region (e.g. the camera region in quad-view) is always the last in the list
- base. We don't want any other to be affected. */
+ /* The free region (e.g. the camera region in quad-view) is always
+ * the last in the list base. We don't want any other to be affected. */
!region->next && //
WM_xr_session_is_ready(&wm->xr);
}
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
index 3fc40fd88e5..3708b8b0531 100644
--- a/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
@@ -387,7 +387,7 @@ void node_bsdf_principled_subsurface(vec4 base_color,
mixed_ss_base_color,
f0,
/* HACK: Pass the multiscatter flag as the sign to not add closure variations
- or increase register usage. */
+ * or increase register usage. */
(use_multiscatter != 0.0) ? f90 : -f90,
int(ssr_id),
roughness,
diff --git a/source/blender/io/collada/BlenderContext.cpp b/source/blender/io/collada/BlenderContext.cpp
index defa875882f..8009f10aa03 100644
--- a/source/blender/io/collada/BlenderContext.cpp
+++ b/source/blender/io/collada/BlenderContext.cpp
@@ -77,7 +77,7 @@ bool bc_is_in_Export_set(LinkNode *export_set, Object *ob, ViewLayer *view_layer
if (!to_export) {
/* Mark this object as to_export even if it is not in the
- export list, but it contains children to export */
+ * export list, but it contains children to export. */
std::vector<Object *> children;
bc_get_children(children, ob, view_layer);
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index a4c0d9a4c40..3d11b3cd7a3 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -105,8 +105,8 @@ typedef struct ClothSimSettings {
/* User set volume. This is the volume the mesh wants to expand to (the equilibrium volume). */
float target_volume;
/* The scaling factor to apply to the actual pressure.
- pressure=( (current_volume/target_volume) - 1 + uniform_pressure_force) *
- pressure_factor */
+ * pressure=( (current_volume/target_volume) - 1 + uniform_pressure_force) *
+ * pressure_factor */
float pressure_factor;
/* Density of the fluid inside or outside the object for use in the hydrostatic pressure
* gradient. */
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 3c2d479bea4..85065ba35d4 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -176,7 +176,7 @@ enum {
};
/* Layer Collection->runtime_flag
- Keep it synced with base->flag based on g_base_collection_flags. */
+ * Keep it synced with base->flag based on g_base_collection_flags. */
enum {
LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
/* LAYER_COLLECTION_VISIBLE_DEPSGRAPH = (1 << 1), */ /* UNUSED */
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 1d24e655f45..5adadd8f8d1 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -64,9 +64,9 @@ typedef struct bSound {
short tags;
char _pad[4];
- /* unused currently
- int type;
- struct bSound *child_sound; */
+ /* Unused currently. */
+ // int type;
+ // struct bSound *child_sound;
/**
* The audaspace handle for cache.
diff --git a/source/blender/makesrna/intern/rna_attribute.c b/source/blender/makesrna/intern/rna_attribute.c
index 9e9575344c5..7f0ab2df70d 100644
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@ -48,14 +48,14 @@ const EnumPropertyItem rna_enum_attribute_type_items[] = {
};
const EnumPropertyItem rna_enum_attribute_domain_items[] = {
- /* Not implement yet
- {ATTR_DOMAIN_GEOMETRY, "GEOMETRY", 0, "Geometry", "Attribute on (whole) geometry"}, */
+ /* Not implement yet */
+ // {ATTR_DOMAIN_GEOMETRY, "GEOMETRY", 0, "Geometry", "Attribute on (whole) geometry"},
{ATTR_DOMAIN_VERTEX, "VERTEX", 0, "Vertex", "Attribute on mesh vertex"},
{ATTR_DOMAIN_EDGE, "EDGE", 0, "Edge", "Attribute on mesh edge"},
{ATTR_DOMAIN_CORNER, "CORNER", 0, "Corner", "Attribute on mesh polygon corner"},
{ATTR_DOMAIN_POLYGON, "POLYGON", 0, "Polygon", "Attribute on mesh polygons"},
- /* Not implement yet
- {ATTR_DOMAIN_GRIDS, "GRIDS", 0, "Grids", "Attribute on mesh multires grids"}, */
+ /* Not implement yet */
+ // {ATTR_DOMAIN_GRIDS, "GRIDS", 0, "Grids", "Attribute on mesh multires grids"},
{ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
{ATTR_DOMAIN_CURVE, "CURVE", 0, "Curve", "Attribute on hair curve"},
{0, NULL, 0, NULL, NULL},
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 9bbdaa9d6d9..6c02e293789 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -889,7 +889,7 @@ void PyC_MainModule_Restore(PyObject *main_mod)
* - Must be called before #Py_Initialize.
* - Expects output of `BKE_appdir_folder_id(BLENDER_PYTHON, NULL)`.
* - Note that the `PYTHONPATH` environment variable isn't reliable, see T31506.
- Use #Py_SetPythonHome instead.
+ * Use #Py_SetPythonHome instead.
*/
void PyC_SetHomePath(const char *py_path_bundle)
{
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
index b056ed40943..7cb1a0bdf4b 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
@@ -314,7 +314,7 @@ void WM_gizmo_do_msg_notify_tag_refresh(bContext *UNUSED(C),
ED_region_tag_redraw(
region); /* Could possibly avoid a full redraw and only tag for editor overlays
- redraw in some cases, see ED_region_tag_redraw_editor_overlays(). */
+ * redraw in some cases, see #ED_region_tag_redraw_editor_overlays(). */
WM_gizmomap_tag_refresh(gzmap);
}