Commit: c7cd74fac3c47ce0c449ba5f2d130c6309242431 Author: Campbell Barton Date: Wed Oct 14 15:24:42 2020 +1100 Branches: master https://developer.blender.org/rBc7cd74fac3c47ce0c449ba5f2d130c6309242431
Cleanup: multi-line comment blocks =================================================================== M source/blender/blenlib/BLI_vector.hh M source/blender/blenlib/intern/math_boolean.cc M source/blender/compositor/intern/COM_NodeOperation.h M source/blender/draw/engines/eevee/eevee_renderpasses.c M source/blender/editors/animation/keyframes_general.c M source/blender/editors/gpencil/annotate_paint.c M source/blender/editors/gpencil/gpencil_paint.c M source/blender/editors/sculpt_paint/paint_stroke.c M source/blender/editors/sculpt_paint/sculpt_intern.h M source/blender/editors/space_node/node_group.c M source/blender/editors/space_outliner/outliner_tools.c M source/blender/editors/space_view3d/view3d_view.c M source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl M source/blender/io/collada/BlenderContext.cpp M source/blender/makesdna/DNA_cloth_types.h M source/blender/makesdna/DNA_layer_types.h M source/blender/makesdna/DNA_sound_types.h M source/blender/makesrna/intern/rna_attribute.c M source/blender/python/generic/py_capi_utils.c M source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c =================================================================== 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_fin @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs