Cleanup: clang-format, trailing space

Minor manual tweak to prevent wrapping an array into columns.
This commit is contained in:
Campbell Barton 2021-03-22 14:22:37 +11:00
parent 2a06657eca
commit 544b3ab1de
15 changed files with 17 additions and 17 deletions

View File

@ -61,4 +61,3 @@ def unregister():
if __name__ == "__main__":
register()

View File

@ -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")

View File

@ -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")

View File

@ -70,4 +70,4 @@ void BKE_cryptomatte_store_metadata(const struct CryptomatteSession *session,
#ifdef __cplusplus
}
#endif
#endif

View File

@ -37,4 +37,4 @@ Mesh *BKE_mesh_boolean(const Mesh **meshes,
#ifdef __cplusplus
}
#endif
#endif

View File

@ -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);
}
}
}

View File

@ -260,4 +260,4 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation(
return operation;
}
/* \} */
/* \} */

View File

@ -90,4 +90,4 @@ void main()
outColor = median_filter(colorBuffer, uvcoordsvar.xy);
outWeight = median_filter(weightBuffer, uvcoordsvar.xy).r;
}
}

View File

@ -290,4 +290,4 @@ void main()
else {
dof_gather_accumulator(base_radius, min_intersectable_radius, false, false);
}
}
}

View File

@ -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;
}
}

View File

@ -209,4 +209,4 @@ void main(void)
fragColor.rgb *= vec3(1.0, 0.1, 0.1);
}
#endif
}
}

View File

@ -98,4 +98,4 @@ const vec2 resolve_sample_offsets[36] = vec2[36](
vec2(2, 0),
vec2(-1, -1),
vec2(3, -1),
vec2(-1, -2));
vec2(-1, -2));

View File

@ -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},
};

View File

@ -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,

View File

@ -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);
}