Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-28 09:11:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-28 09:11:49 +0300
commit8d81a3da37c45d2b61f1616522c7540445312604 (patch)
treef47cf9112ff666257c2b51390e958484f93d0dab /source/blender/editors
parent671eb29d43723ac6aa4325128953855a6703e401 (diff)
Cleanup: clang format
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/curve/editcurve.c3
-rw-r--r--source/blender/editors/io/io_collada.c14
-rw-r--r--source/blender/editors/object/object_transform.c3
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 5dbc2dd74eb..8d131ee28ba 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -3307,7 +3307,8 @@ static int reveal_exec(bContext *C, wmOperator *op)
}
if (changed) {
- DEG_id_tag_update(obedit->data, ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
+ DEG_id_tag_update(obedit->data,
+ ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
changed_multi = true;
}
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index c5c24051299..1f844961d19 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -172,10 +172,10 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
use_blender_profile = RNA_boolean_get(op->ptr, "use_blender_profile");
sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name");
- export_object_transformation_type = RNA_enum_get(
- op->ptr, "export_object_transformation_type_selection");
+ export_object_transformation_type = RNA_enum_get(op->ptr,
+ "export_object_transformation_type_selection");
export_animation_transformation_type = RNA_enum_get(
- op->ptr, "export_animation_transformation_type_selection");
+ op->ptr, "export_animation_transformation_type_selection");
open_sim = RNA_boolean_get(op->ptr, "open_sim");
limit_precision = RNA_boolean_get(op->ptr, "limit_precision");
@@ -271,11 +271,11 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
bool include_animations = RNA_boolean_get(imfptr, "include_animations");
int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section");
- BC_export_animation_type animation_type = RNA_enum_get(
- imfptr, "export_animation_type_selection");
+ BC_export_animation_type animation_type = RNA_enum_get(imfptr,
+ "export_animation_type_selection");
BC_export_transformation_type animation_transformation_type = RNA_enum_get(
- imfptr, "export_animation_transformation_type_selection");
+ imfptr, "export_animation_transformation_type_selection");
bool sampling = animation_type == BC_ANIMATION_EXPORT_SAMPLES;
@@ -727,7 +727,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
INT_MAX,
"Transform",
"Transformation type for translation, scale and rotation\n"
- "Note: The Animation transformation type in the Anim Tab\n"\
+ "Note: The Animation transformation type in the Anim Tab\n"
"is always equal to the Object transformation type in the Geom tab",
INT_MIN,
INT_MAX);
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 61cdf689044..00f5dffb3cc 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -1336,8 +1336,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
DEG_id_tag_update(&tob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
}
/* special support for dupligroups */
- else if (tob->instance_collection &&
- tob->instance_collection->id.tag & LIB_TAG_DOIT) {
+ else if (tob->instance_collection && tob->instance_collection->id.tag & LIB_TAG_DOIT) {
DEG_id_tag_update(&tob->id, ID_RECALC_TRANSFORM);
DEG_id_tag_update(&tob->instance_collection->id, ID_RECALC_COPY_ON_WRITE);
}