[Bf-blender-cvs] [544b3ab1de0] master: Cleanup: clang-format, trailing space
Campbell Barton
noreply at git.blender.org
Mon Mar 22 04:40:19 CET 2021
Commit: 544b3ab1de016b6c4557c2b5664f4f0e013fcd1c
Author: Campbell Barton
Date: Mon Mar 22 14:22:37 2021 +1100
Branches: master
https://developer.blender.org/rB544b3ab1de016b6c4557c2b5664f4f0e013fcd1c
Cleanup: clang-format, trailing space
Minor manual tweak to prevent wrapping an array into columns.
===================================================================
M doc/python_api/examples/bpy.types.Depsgraph.7.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M source/blender/blenkernel/BKE_cryptomatte.h
M source/blender/blenkernel/BKE_mesh_boolean_convert.h
M source/blender/compositor/intern/COM_MetaData.cc
M source/blender/compositor/nodes/COM_CryptomatteNode.cc
M source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
M source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
M source/blender/python/intern/bpy_app_build_options.c
M source/blender/sequencer/SEQ_add.h
M source/blender/sequencer/intern/effects.c
===================================================================
diff --git a/doc/python_api/examples/bpy.types.Depsgraph.7.py b/doc/python_api/examples/bpy.types.Depsgraph.7.py
index 61209a6b9d2..11982730fc9 100644
--- a/doc/python_api/examples/bpy.types.Depsgraph.7.py
+++ b/doc/python_api/examples/bpy.types.Depsgraph.7.py
@@ -61,4 +61,3 @@ def unregister():
if __name__ == "__main__":
register()
-
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index f7ba9ebcb43..ade6f4cbb79 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -609,7 +609,7 @@ class DOPESHEET_MT_context_menu(Menu):
layout.separator()
layout.operator_menu_enum("action.keyframe_type", "type", text="Keyframe Type")
-
+
if st.mode != 'GPENCIL':
layout.operator_menu_enum("action.handle_type", "type", text="Handle Type")
layout.operator_menu_enum("action.interpolation_type", "type", text="Interpolation Mode")
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index 31e81d1454e..9ba3bd8f8cc 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -136,7 +136,7 @@ class GRAPH_MT_view(Menu):
layout.separator()
layout.prop(st, "show_extrapolation")
-
+
layout.prop(st, "show_handles")
layout.prop(st, "use_only_selected_curves_handles")
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index 576a2c1effd..e98a9b2b1fd 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -70,4 +70,4 @@ void BKE_cryptomatte_store_metadata(const struct CryptomatteSession *session,
#ifdef __cplusplus
}
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/blenkernel/BKE_mesh_boolean_convert.h b/source/blender/blenkernel/BKE_mesh_boolean_convert.h
index 1bb1d9ea8dc..c126d714542 100644
--- a/source/blender/blenkernel/BKE_mesh_boolean_convert.h
+++ b/source/blender/blenkernel/BKE_mesh_boolean_convert.h
@@ -37,4 +37,4 @@ Mesh *BKE_mesh_boolean(const Mesh **meshes,
#ifdef __cplusplus
}
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/compositor/intern/COM_MetaData.cc b/source/blender/compositor/intern/COM_MetaData.cc
index a6306f6c657..ad72b242c8c 100644
--- a/source/blender/compositor/intern/COM_MetaData.cc
+++ b/source/blender/compositor/intern/COM_MetaData.cc
@@ -103,4 +103,4 @@ void MetaDataExtractCallbackData::extract_cryptomatte_meta_data(void *_data,
else if (key == data->manifest_key) {
data->addMetaData(META_DATA_KEY_CRYPTOMATTE_MANIFEST, propvalue);
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
index 504266da5d7..591db8a96e5 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
@@ -260,4 +260,4 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation(
return operation;
}
-/* \} */
\ No newline at end of file
+/* \} */
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
index 8fd8215da0f..78c80438f60 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
@@ -90,4 +90,4 @@ void main()
outColor = median_filter(colorBuffer, uvcoordsvar.xy);
outWeight = median_filter(weightBuffer, uvcoordsvar.xy).r;
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
index 79c95b6d433..8c2633084db 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
@@ -290,4 +290,4 @@ void main()
else {
dof_gather_accumulator(base_radius, min_intersectable_radius, false, false);
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
index 3ad3c90d27a..faac216480b 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
@@ -622,4 +622,4 @@ ivec2 dof_square_ring_sample_offset(int ring_distance, int sample_id)
offset.y = ring_distance - sample_id + 3 * ring_distance;
}
return offset;
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
index 469745206e2..cd69a0e2ab1 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
@@ -209,4 +209,4 @@ void main(void)
fragColor.rgb *= vec3(1.0, 0.1, 0.1);
}
#endif
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl b/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
index cc73bbbfe29..ed600a3be86 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
@@ -98,4 +98,4 @@ const vec2 resolve_sample_offsets[36] = vec2[36](
vec2(2, 0),
vec2(-1, -1),
vec2(3, -1),
- vec2(-1, -2));
\ No newline at end of file
+ vec2(-1, -2));
diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index f7b71c769d1..9f12c9f80f1 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -27,7 +27,7 @@
static PyTypeObject BlenderAppBuildOptionsType;
static PyStructSequence_Field app_builtopts_info_fields[] = {
- /* names mostly follow CMake options, lowercase, after WITH_ */
+ /* names mostly follow CMake options, lowercase, after `WITH_` */
{"bullet", NULL},
{"codec_avi", NULL},
{"codec_ffmpeg", NULL},
@@ -65,6 +65,7 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
{"fluid", NULL},
{"xr_openxr", NULL},
{"potrace", NULL},
+ /* Sentinel (this line prevents `clang-format` wrapping into columns). */
{NULL},
};
diff --git a/source/blender/sequencer/SEQ_add.h b/source/blender/sequencer/SEQ_add.h
index 983f5ab1391..9cb52145c04 100644
--- a/source/blender/sequencer/SEQ_add.h
+++ b/source/blender/sequencer/SEQ_add.h
@@ -80,8 +80,8 @@ struct Sequence *SEQ_add_sound_strip(struct Main *bmain,
struct ListBase *seqbase,
struct SeqLoadData *load_data);
struct Sequence *SEQ_add_meta_strip(struct Scene *scene,
- struct ListBase *seqbase,
- struct SeqLoadData *load_data);
+ struct ListBase *seqbase,
+ struct SeqLoadData *load_data);
struct Sequence *SEQ_add_movie_strip(struct Main *bmain,
struct Scene *scene,
struct ListBase *seqbase,
diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index cdb7f5de627..87412d61f0e 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -3946,10 +3946,10 @@ static ImBuf *do_text_effect(const SeqRenderData *context,
}
BLF_disable(font, BLF_ITALIC | BLF_BOLD);
- if (data->flag & SEQ_TEXT_BOLD) {
+ if (data->flag & SEQ_TEXT_BOLD) {
BLF_enable(font, BLF_BOLD);
}
- if (data->flag & SEQ_TEXT_ITALIC) {
+ if (data->flag & SEQ_TEXT_ITALIC) {
BLF_enable(font, BLF_ITALIC);
}
More information about the Bf-blender-cvs
mailing list