Commit: 30e666f747bae89d50029cbcc505ffa9a12ab05e Author: Campbell Barton Date: Thu May 19 10:02:28 2022 +1000 Branches: master https://developer.blender.org/rB30e666f747bae89d50029cbcc505ffa9a12ab05e
Cleanup: format, reduce line length & strip trailing space =================================================================== M intern/cycles/cmake/external_libs.cmake M release/scripts/modules/bl_i18n_utils/settings.py M source/blender/draw/DRW_select_buffer.h M source/blender/draw/engines/eevee/shaders/surface_lib.glsl M source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl M source/blender/draw/engines/eevee_next/eevee_pipeline.cc M source/blender/draw/engines/eevee_next/eevee_pipeline.hh M source/blender/draw/intern/draw_manager_data.c M source/blender/editors/curves/CMakeLists.txt M source/blender/editors/mesh/mesh_intern.h M source/blender/editors/space_sequencer/sequencer_draw.c M source/blender/gpu/GPU_common_types.h M source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl M source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl M source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl M source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl M source/blender/makesdna/DNA_gpencil_modifier_defaults.h M source/blender/makesdna/DNA_sequence_types.h M source/blender/modifiers/intern/MOD_util.h M source/blender/python/intern/bpy_rna_text.h =================================================================== diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index f4186374d10..d2f30fe764b 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -145,8 +145,8 @@ if(CYCLES_STANDALONE_REPOSITORY) -DOIIO_STATIC_DEFINE ) - set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO_ROOT_DIR}/include) - set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO) + set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO_ROOT_DIR}/include) + set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO) # Special exceptions for libraries which needs explicit debug version set(OPENIMAGEIO_LIBRARIES optimized ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO.lib diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 58e7486b39b..57722d06ce5 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -256,7 +256,7 @@ PYGETTEXT_KEYWORDS = (() + # bUnitDef unit names. # NOTE: regex is a bit more complex than it would need too. Since the actual # identifier (`B_UNIT_DEF_`) is at the end, if it's simpler/too general it - # becomes extremely slow to process some (unrelated) source files. + # becomes extremely slow to process some (unrelated) source files. ((r"\{(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*NULL\s*,)){4}\s*" + _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*NULL\s*,))(?:[^,]+,){2}" + "\s*B_UNIT_DEF_[_A-Z]+\s*\}"),) + diff --git a/source/blender/draw/DRW_select_buffer.h b/source/blender/draw/DRW_select_buffer.h index d15ec8bed56..5bc7aee92ba 100644 --- a/source/blender/draw/DRW_select_buffer.h +++ b/source/blender/draw/DRW_select_buffer.h @@ -140,4 +140,4 @@ void DRW_select_buffer_context_create(struct Base **bases, uint bases_len, short #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/surface_lib.glsl b/source/blender/draw/engines/eevee/shaders/surface_lib.glsl index 696e5d4c97b..23324146b7e 100644 --- a/source/blender/draw/engines/eevee/shaders/surface_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/surface_lib.glsl @@ -203,4 +203,4 @@ vec3 coordinate_incoming(vec3 P) #else return cameraVec(P); #endif -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl index ce863bdf660..186f438b03b 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl @@ -76,4 +76,4 @@ vec3 coordinate_reflect(vec3 P, vec3 N) vec3 coordinate_incoming(vec3 P) { return vec3(0.0); -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc index 8ae19eeebb8..33853eba06c 100644 --- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc +++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc @@ -235,4 +235,4 @@ void ForwardPipeline::render(const DRWView *view, /** \} */ -} // namespace blender::eevee \ No newline at end of file +} // namespace blender::eevee diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh index 35f7712f3d3..3bdc718767b 100644 --- a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh +++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh @@ -226,4 +226,4 @@ class PipelineModule { /** \} */ -} // namespace blender::eevee \ No newline at end of file +} // namespace blender::eevee diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 9b70904a8fb..f0960c5324b 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -647,7 +647,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob) drw_call_calc_orco(ob, ob_infos->orcotexfac); /* Random float value. */ uint random = (DST.dupli_source) ? - DST.dupli_source->random_id : + DST.dupli_source->random_id : /* TODO(fclem): this is rather costly to do at runtime. Maybe we can * put it in ob->runtime and make depsgraph ensure it is up to date. */ BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0); diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt index 383640504c4..a5d8390e7f2 100644 --- a/source/blender/editors/curves/CMakeLists.txt +++ b/source/blender/editors/curves/CMakeLists.txt @@ -28,4 +28,3 @@ set(LIB blender_add_lib(bf_editor_curves "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_dependencies(bf_editor_curves bf_rna) - diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 196c4957d84..1ee4be50322 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -321,4 +321,4 @@ void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index ef2b1f8b91d..02e77732e02 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1098,11 +1098,8 @@ static void draw_seq_background(Scene *scene, /* Draw the main strip body. */ if (is_single_image) { - immRectf(pos, - SEQ_time_left_handle_frame_get(seq), - y1, - SEQ_time_right_handle_frame_get(seq), - y2); + immRectf( + pos, SEQ_time_left_handle_frame_get(seq), y1, SEQ_time_right_handle_frame_get(seq), y2); } else { immRectf(pos, x1, y1, x2, y2); diff --git a/source/blender/gpu/GPU_common_types.h b/source/blender/gpu/GPU_common_types.h index e08143c2449..8c91d60812f 100644 --- a/source/blender/gpu/GPU_common_types.h +++ b/source/blender/gpu/GPU_common_types.h @@ -15,4 +15,4 @@ typedef enum eGPUFrontFace { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl b/source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl index ecb2dddcd63..9fd54f3f31f 100644 --- a/source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl +++ b/source/blender/gpu/metal/kernels/depth_2d_update_float_frag.glsl @@ -7,4 +7,4 @@ in vec2 texCoord_interp; void main() { gl_FragDepth = textureLod(source_data, texCoord_interp, mip).r; -} \ No newline at end of file +} diff --git a/source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl b/source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl index 99661a760f0..7483343503f 100644 --- a/source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl +++ b/source/blender/gpu/metal/kernels/depth_2d_update_int24_frag.glsl @@ -10,4 +10,4 @@ void main() uint stencil = (val >> 24) & 0xFFu; uint depth = (val)&0xFFFFFFu; gl_FragDepth = float(depth) / float(0xFFFFFFu); -} \ No newline at end of file +} diff --git a/source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl b/source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl index 15271ab2cdd..75d42c57f73 100644 --- a/source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl +++ b/source/blender/gpu/metal/kernels/depth_2d_update_int32_frag.glsl @@ -9,4 +9,4 @@ void main() uint val = textureLod(source_data, texCoord_interp, mip).r; uint depth = (val) & (0xFFFFFFFFu); gl_FragDepth = float(depth) / float(0xFFFFFFFFu); -} \ No newline at end of file +} diff --git a/source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl b/source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl index 092ae45b719..faae68d2f55 100644 --- a/source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl +++ b/source/blender/gpu/metal/kernels/depth_2d_update_vert.glsl @@ -30,4 +30,4 @@ void main() texCoord_interp = tex.zy; } gl_Position = vec4(rect.xy, 0.0f, 1.0f); -} \ No newline at end of file +} diff --git a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h index 70bbf5b4a49..ae47bf5d524 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h @@ -303,7 +303,8 @@ .crease_threshold = DEG2RAD(140.0f), \ .calculation_flags = LRT_ALLOW_DUPLI_OBJECTS | LRT_ALLOW_CLIPPING_BOUNDARIES | \ LRT_USE_CREASE_ON_SHARP_EDGES | LRT_FILTER_FACE_MARK_KEEP_CONTOUR, \ - .angle_splitting_threshold = 0.0f, /* Do not split by default, this is for better chaining quality. */ \ + /* Do not split by default, this is for better chaining quality. */ \ + .angle_splitting_threshold = 0.0f, \ .chaining_image_threshold = 0.001f, \ .chain_smooth_tolerance = 0.2f,\ .stroke_depth_offset = 0.05,\ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index de8df196e47..a54fd838bbe 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -161,7 +161,7 @@ typedef struct Sequence { * Frames that use the first frame before data begins, * frames that use the last frame after data ends. */ - int startstill DNA_DEPRECATED, endstill DNA_DEPRECATED; + int startstill DNA_DEPRECATED, endstill DNA_DEPRECATED; /** Machine: the strip channel */ int machine; int _pad3; diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index c37d6a3f2c1..b3b75898557 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util. @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs