From 0c7a4c74d3452eba123749366abe23900890a53b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Aug 2019 20:01:35 +1000 Subject: Cleanup: clang-format, also typo fix. --- source/blender/blenkernel/BKE_collection.h | 2 +- source/blender/blenkernel/intern/library_query.c | 2 +- source/blender/draw/DRW_engine.h | 4 +--- source/blender/editors/space_text/text_undo.c | 1 - source/blender/ikplugin/intern/itasc_plugin.cpp | 6 +++--- source/blender/makesrna/intern/rna_rna.c | 5 +++-- 6 files changed, 9 insertions(+), 11 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index 972ae5e8628..0ab101f065d 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -171,7 +171,7 @@ void BKE_main_collections_parent_relations_rebuild(struct Main *bmain); typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data); typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data); -/* Iteratorion over objects in collection. */ +/* Iteration over objects in collection. */ #define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(_collection, _object, _mode) \ { \ diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index db4265d0894..bf77c1417ea 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -376,7 +376,7 @@ static void library_foreach_ID_link(Main *bmain, int i; if (flag & IDWALK_RECURSE) { - /* For now, recursion implies read-only. */ + /* For now, recursion implies read-only. */ flag |= IDWALK_READONLY; data.ids_handled = BLI_gset_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__); diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 491717d0137..be04452f079 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -177,9 +177,7 @@ struct DrawDataList *DRW_drawdatalist_from_id(struct ID *id); void DRW_drawdata_free(struct ID *id); /* select_engine.c */ -void DRW_select_context_create(struct Base **bases, - const uint bases_len, - short select_mode); +void DRW_select_context_create(struct Base **bases, const uint bases_len, short select_mode); bool DRW_select_elem_get(const uint sel_id, uint *r_elem, uint *r_base_index, char *r_elem_type); uint DRW_select_context_offset_for_object_elem(const uint base_index, char elem_type); uint DRW_select_context_elem_len(void); diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index e646efe673d..a6393291f9a 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -201,7 +201,6 @@ static void text_undosys_step_decode( TextUndoStep *us = (TextUndoStep *)us_p; Text *text = us->text_ref.ptr; - (void)is_final; TextState *state; if ((us->states[0].buf_array_state != NULL) && (dir == -1) && !is_final) { state = &us->states[0]; diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index 0401c485c2a..883919d76ec 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -1729,9 +1729,9 @@ static void execute_scene(struct Depsgraph *depsgraph, IK_Channel *ikchan; if (ikparam->flag & ITASC_SIMULATION) { for (i = 0, ikchan = ikscene->channels; i < ikscene->numchan; i++, ++ikchan) { - // In simulation mode we don't allow external constraint to change our bones, mark the channel - // done also tell Blender that this channel is part of IK tree - // (cleared on each BKE_pose_where_is() + // In simulation mode we don't allow external constraint to change our bones, + // mark the channel done also tell Blender that this channel is part of IK tree. + // Cleared on each BKE_pose_where_is() ikchan->pchan->flag |= (POSE_DONE | POSE_CHAIN); ikchan->jointValid = 0; } diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 3ca4792f9b4..f17e9ce28fe 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -3076,8 +3076,9 @@ void RNA_def_rna(BlenderRNA *brna) /* FloatProperty */ srna = RNA_def_struct(brna, "FloatProperty", "Property"); - RNA_def_struct_ui_text( - srna, "Float Definition", "RNA floating point number (single precision) property definition"); + RNA_def_struct_ui_text(srna, + "Float Definition", + "RNA floating point number (single precision) property definition"); rna_def_number_property(srna, PROP_FLOAT); /* StringProperty */ -- cgit v1.2.3