Cleanup: multi-line comment blocks
This commit is contained in:
@@ -186,7 +186,7 @@ class Vector {
|
|||||||
|
|
||||||
template<typename InputIt,
|
template<typename InputIt,
|
||||||
/* This constructor should not be called with e.g. Vector(3, 10), because that is
|
/* 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>
|
typename std::enable_if_t<!std::is_convertible_v<InputIt, int>> * = nullptr>
|
||||||
Vector(InputIt first, InputIt last, Allocator allocator = {})
|
Vector(InputIt first, InputIt last, Allocator allocator = {})
|
||||||
: Vector(NoExceptConstructor(), allocator)
|
: Vector(NoExceptConstructor(), allocator)
|
||||||
|
@@ -123,7 +123,7 @@ namespace robust_pred {
|
|||||||
* Since this is C++, an instantiated singleton class is used to make
|
* Since this is C++, an instantiated singleton class is used to make
|
||||||
* sure that #exactinit() is called once.
|
* sure that #exactinit() is called once.
|
||||||
* (Because it's undefined when this is called in initialization of all modules,
|
* (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();
|
void exactinit();
|
||||||
|
@@ -51,20 +51,20 @@ class NodeOperationOutput;
|
|||||||
*/
|
*/
|
||||||
typedef enum InputResizeMode {
|
typedef enum InputResizeMode {
|
||||||
/** \brief Center the input image to the center of the working area of the node, no resizing
|
/** \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,
|
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,
|
/** \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,
|
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 */
|
/** \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,
|
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 */
|
/** \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,
|
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
|
/** \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,
|
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
|
/** \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,
|
COM_SC_STRETCH = NS_CR_STRETCH,
|
||||||
} InputResizeMode;
|
} InputResizeMode;
|
||||||
|
|
||||||
|
@@ -367,8 +367,8 @@ void EEVEE_renderpasses_draw(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
|
|||||||
EEVEE_EffectsInfo *effects = stl->effects;
|
EEVEE_EffectsInfo *effects = stl->effects;
|
||||||
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
|
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
|
||||||
|
|
||||||
/* We can only draw a single renderpass. Lightpasses also select their color pass (a second
|
/* We can only draw a single renderpass. Lightpasses also select their color pass
|
||||||
pass). We mask the light pass when a light pass is selected. */
|
* (a second pass). We mask the light pass when a light pass is selected. */
|
||||||
const eViewLayerEEVEEPassType render_pass =
|
const eViewLayerEEVEEPassType render_pass =
|
||||||
((stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) != 0) ?
|
((stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) != 0) ?
|
||||||
(stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) :
|
(stl->g_data->render_passes & EEVEE_RENDERPASSES_LIGHT_PASS) :
|
||||||
|
@@ -390,7 +390,7 @@ static void decimate_fcurve_segment(FCurve *fcu,
|
|||||||
BKE_curve_decimate_bezt_array(&fcu->bezt[bezt_segment_start_idx],
|
BKE_curve_decimate_bezt_array(&fcu->bezt[bezt_segment_start_idx],
|
||||||
bezt_segment_len,
|
bezt_segment_len,
|
||||||
12, /* The actual resolution displayed in the viewport is dynamic
|
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,
|
false,
|
||||||
SELECT,
|
SELECT,
|
||||||
BEZT_FLAG_TEMP_TAG,
|
BEZT_FLAG_TEMP_TAG,
|
||||||
|
@@ -2090,7 +2090,7 @@ static void annotation_draw_apply_event(
|
|||||||
else {
|
else {
|
||||||
p->straight[0] = 0;
|
p->straight[0] = 0;
|
||||||
/* We were using shift while having permanent stabilization active,
|
/* 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) {
|
||||||
if ((p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) == 0) {
|
if ((p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) == 0) {
|
||||||
annotation_draw_toggle_stabilizer_cursor(p, true);
|
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,
|
/* We are using the temporal stabilizer flag atm,
|
||||||
but shift is not pressed as well as the permanent flag is not used,
|
* but shift is not pressed as well as the permanent flag is not used,
|
||||||
so we don't need the cursor anymore. */
|
* so we don't need the cursor anymore. */
|
||||||
else if (p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) {
|
else if (p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) {
|
||||||
/* Reset temporal stabilizer flag and remove cursor. */
|
/* Reset temporal stabilizer flag and remove cursor. */
|
||||||
p->flags &= ~GP_PAINTFLAG_USE_STABILIZER_TEMP;
|
p->flags &= ~GP_PAINTFLAG_USE_STABILIZER_TEMP;
|
||||||
|
@@ -3471,8 +3471,7 @@ static void gpencil_add_fake_points(const wmEvent *event, tGPsdata *p)
|
|||||||
(p->brush && (p->brush->gpencil_tool == GPAINT_TOOL_DRAW)));
|
(p->brush && (p->brush->gpencil_tool == GPAINT_TOOL_DRAW)));
|
||||||
|
|
||||||
/* TODO: ensure sampling enough points when using circular guide,
|
/* 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)) {
|
if (is_speed_guide && (guide->type == GP_GUIDE_CIRCULAR)) {
|
||||||
input_samples = GP_MAX_INPUT_SAMPLES;
|
input_samples = GP_MAX_INPUT_SAMPLES;
|
||||||
}
|
}
|
||||||
|
@@ -698,8 +698,8 @@ static float paint_space_stroke_spacing(bContext *C,
|
|||||||
if (SCULPT_is_cloth_deform_brush(brush)) {
|
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
|
/* 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.
|
* 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
|
* With a value of 100 and the brush default of 10 for spacing, a simulation step runs every 2
|
||||||
pixels movement of the cursor. */
|
* pixels movement of the cursor. */
|
||||||
size_clamp = 100.0f;
|
size_clamp = 100.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -415,7 +415,7 @@ BLI_INLINE bool SCULPT_is_cloth_deform_brush(const Brush *brush)
|
|||||||
BRUSH_CLOTH_DEFORM_GRAB,
|
BRUSH_CLOTH_DEFORM_GRAB,
|
||||||
BRUSH_CLOTH_DEFORM_SNAKE_HOOK)) ||
|
BRUSH_CLOTH_DEFORM_SNAKE_HOOK)) ||
|
||||||
/* All brushes that are not the cloth brush deform the simulation using softbody
|
/* 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->sculpt_tool != SCULPT_TOOL_CLOTH &&
|
||||||
brush->deform_target == BRUSH_DEFORM_TARGET_CLOTH_SIM);
|
brush->deform_target == BRUSH_DEFORM_TARGET_CLOTH_SIM);
|
||||||
}
|
}
|
||||||
|
@@ -326,12 +326,14 @@ static int node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode)
|
|||||||
/* if group output is not externally linked,
|
/* if group output is not externally linked,
|
||||||
* convert the constant input value to ensure somewhat consistent behavior */
|
* convert the constant input value to ensure somewhat consistent behavior */
|
||||||
if (num_external_links == 0) {
|
if (num_external_links == 0) {
|
||||||
/* XXX TODO bNodeSocket *sock = node_group_find_input_socket(gnode, identifier);
|
/* TODO */
|
||||||
BLI_assert(sock);*/
|
#if 0
|
||||||
|
bNodeSocket *sock = node_group_find_input_socket(gnode, identifier);
|
||||||
|
BLI_assert(sock);
|
||||||
|
|
||||||
/* XXX TODO
|
nodeSocketCopy(
|
||||||
* nodeSocketCopy(ntree, link->tosock->new_sock, link->tonode->new_node,
|
ntree, link->tosock->new_sock, link->tonode->new_node, ntree, sock, gnode);
|
||||||
* 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,
|
/* if group output is not internally linked,
|
||||||
* convert the constant output value to ensure somewhat consistent behavior */
|
* convert the constant output value to ensure somewhat consistent behavior */
|
||||||
if (num_internal_links == 0) {
|
if (num_internal_links == 0) {
|
||||||
/* XXX TODO bNodeSocket *sock = node_group_find_output_socket(gnode, identifier);
|
/* TODO */
|
||||||
BLI_assert(sock);*/
|
#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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1791,7 +1791,7 @@ static bool outliner_id_operation_item_poll(bContext *C,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
/* TODO(dalai): enable in the few cases where this can be supported
|
/* 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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1782,8 +1782,8 @@ bool ED_view3d_is_region_xr_mirror_active(const wmWindowManager *wm,
|
|||||||
const ARegion *region)
|
const ARegion *region)
|
||||||
{
|
{
|
||||||
return (v3d->flag & V3D_XR_SESSION_MIRROR) &&
|
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
|
/* The free region (e.g. the camera region in quad-view) is always
|
||||||
base. We don't want any other to be affected. */
|
* the last in the list base. We don't want any other to be affected. */
|
||||||
!region->next && //
|
!region->next && //
|
||||||
WM_xr_session_is_ready(&wm->xr);
|
WM_xr_session_is_ready(&wm->xr);
|
||||||
}
|
}
|
||||||
|
@@ -387,7 +387,7 @@ void node_bsdf_principled_subsurface(vec4 base_color,
|
|||||||
mixed_ss_base_color,
|
mixed_ss_base_color,
|
||||||
f0,
|
f0,
|
||||||
/* HACK: Pass the multiscatter flag as the sign to not add closure variations
|
/* 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,
|
(use_multiscatter != 0.0) ? f90 : -f90,
|
||||||
int(ssr_id),
|
int(ssr_id),
|
||||||
roughness,
|
roughness,
|
||||||
|
@@ -77,7 +77,7 @@ bool bc_is_in_Export_set(LinkNode *export_set, Object *ob, ViewLayer *view_layer
|
|||||||
|
|
||||||
if (!to_export) {
|
if (!to_export) {
|
||||||
/* Mark this object as to_export even if it is not in the
|
/* 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;
|
std::vector<Object *> children;
|
||||||
bc_get_children(children, ob, view_layer);
|
bc_get_children(children, ob, view_layer);
|
||||||
|
@@ -105,8 +105,8 @@ typedef struct ClothSimSettings {
|
|||||||
/* User set volume. This is the volume the mesh wants to expand to (the equilibrium volume). */
|
/* User set volume. This is the volume the mesh wants to expand to (the equilibrium volume). */
|
||||||
float target_volume;
|
float target_volume;
|
||||||
/* The scaling factor to apply to the actual pressure.
|
/* The scaling factor to apply to the actual pressure.
|
||||||
pressure=( (current_volume/target_volume) - 1 + uniform_pressure_force) *
|
* pressure=( (current_volume/target_volume) - 1 + uniform_pressure_force) *
|
||||||
pressure_factor */
|
* pressure_factor */
|
||||||
float pressure_factor;
|
float pressure_factor;
|
||||||
/* Density of the fluid inside or outside the object for use in the hydrostatic pressure
|
/* Density of the fluid inside or outside the object for use in the hydrostatic pressure
|
||||||
* gradient. */
|
* gradient. */
|
||||||
|
@@ -176,7 +176,7 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* Layer Collection->runtime_flag
|
/* 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 {
|
enum {
|
||||||
LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
|
LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
|
||||||
/* LAYER_COLLECTION_VISIBLE_DEPSGRAPH = (1 << 1), */ /* UNUSED */
|
/* LAYER_COLLECTION_VISIBLE_DEPSGRAPH = (1 << 1), */ /* UNUSED */
|
||||||
|
@@ -64,9 +64,9 @@ typedef struct bSound {
|
|||||||
short tags;
|
short tags;
|
||||||
char _pad[4];
|
char _pad[4];
|
||||||
|
|
||||||
/* unused currently
|
/* Unused currently. */
|
||||||
int type;
|
// int type;
|
||||||
struct bSound *child_sound; */
|
// struct bSound *child_sound;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The audaspace handle for cache.
|
* The audaspace handle for cache.
|
||||||
|
@@ -48,14 +48,14 @@ const EnumPropertyItem rna_enum_attribute_type_items[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const EnumPropertyItem rna_enum_attribute_domain_items[] = {
|
const EnumPropertyItem rna_enum_attribute_domain_items[] = {
|
||||||
/* Not implement yet
|
/* Not implement yet */
|
||||||
{ATTR_DOMAIN_GEOMETRY, "GEOMETRY", 0, "Geometry", "Attribute on (whole) geometry"}, */
|
// {ATTR_DOMAIN_GEOMETRY, "GEOMETRY", 0, "Geometry", "Attribute on (whole) geometry"},
|
||||||
{ATTR_DOMAIN_VERTEX, "VERTEX", 0, "Vertex", "Attribute on mesh vertex"},
|
{ATTR_DOMAIN_VERTEX, "VERTEX", 0, "Vertex", "Attribute on mesh vertex"},
|
||||||
{ATTR_DOMAIN_EDGE, "EDGE", 0, "Edge", "Attribute on mesh edge"},
|
{ATTR_DOMAIN_EDGE, "EDGE", 0, "Edge", "Attribute on mesh edge"},
|
||||||
{ATTR_DOMAIN_CORNER, "CORNER", 0, "Corner", "Attribute on mesh polygon corner"},
|
{ATTR_DOMAIN_CORNER, "CORNER", 0, "Corner", "Attribute on mesh polygon corner"},
|
||||||
{ATTR_DOMAIN_POLYGON, "POLYGON", 0, "Polygon", "Attribute on mesh polygons"},
|
{ATTR_DOMAIN_POLYGON, "POLYGON", 0, "Polygon", "Attribute on mesh polygons"},
|
||||||
/* Not implement yet
|
/* Not implement yet */
|
||||||
{ATTR_DOMAIN_GRIDS, "GRIDS", 0, "Grids", "Attribute on mesh multires grids"}, */
|
// {ATTR_DOMAIN_GRIDS, "GRIDS", 0, "Grids", "Attribute on mesh multires grids"},
|
||||||
{ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
|
{ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
|
||||||
{ATTR_DOMAIN_CURVE, "CURVE", 0, "Curve", "Attribute on hair curve"},
|
{ATTR_DOMAIN_CURVE, "CURVE", 0, "Curve", "Attribute on hair curve"},
|
||||||
{0, NULL, 0, NULL, NULL},
|
{0, NULL, 0, NULL, NULL},
|
||||||
|
@@ -889,7 +889,7 @@ void PyC_MainModule_Restore(PyObject *main_mod)
|
|||||||
* - Must be called before #Py_Initialize.
|
* - Must be called before #Py_Initialize.
|
||||||
* - Expects output of `BKE_appdir_folder_id(BLENDER_PYTHON, NULL)`.
|
* - Expects output of `BKE_appdir_folder_id(BLENDER_PYTHON, NULL)`.
|
||||||
* - Note that the `PYTHONPATH` environment variable isn't reliable, see T31506.
|
* - 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)
|
void PyC_SetHomePath(const char *py_path_bundle)
|
||||||
{
|
{
|
||||||
|
@@ -314,7 +314,7 @@ void WM_gizmo_do_msg_notify_tag_refresh(bContext *UNUSED(C),
|
|||||||
|
|
||||||
ED_region_tag_redraw(
|
ED_region_tag_redraw(
|
||||||
region); /* Could possibly avoid a full redraw and only tag for editor overlays
|
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);
|
WM_gizmomap_tag_refresh(gzmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user