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-04-20 21:40:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-20 21:40:16 +0300
commit2fb9c8ef125f975596b6ef9c8f021403f8279bdf (patch)
tree02633f97a682dcd4935bf9b3170dfe5841ed048a /source/blender/editors/object
parent6b9ce24338de1a33dbf41e14e85a1630b1a2b899 (diff)
Cleanup: add missing macros to clang-format
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_collection.c9
-rw-r--r--source/blender/editors/object/object_constraint.c9
2 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c
index 0b22dec99c7..e0de4b8faef 100644
--- a/source/blender/editors/object/object_collection.c
+++ b/source/blender/editors/object/object_collection.c
@@ -139,8 +139,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
/* now add all selected objects to the collection(s) */
- FOREACH_COLLECTION_BEGIN(bmain, scene, Collection *, collection)
- {
+ FOREACH_COLLECTION_BEGIN (bmain, scene, Collection *, collection) {
if (single_collection && collection != single_collection)
continue;
if (!BKE_collection_has_object(collection, ob))
@@ -220,8 +219,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
/* Linking to same collection requires its own loop so we can avoid
* looking up the active objects collections each time. */
- FOREACH_COLLECTION_BEGIN(bmain, scene, Collection *, collection)
- {
+ FOREACH_COLLECTION_BEGIN (bmain, scene, Collection *, collection) {
if (single_collection && collection != single_collection)
continue;
@@ -319,8 +317,7 @@ static int collection_objects_remove_exec(bContext *C, wmOperator *op)
if (ob == NULL)
return OPERATOR_CANCELLED;
- FOREACH_COLLECTION_BEGIN(bmain, scene, Collection *, collection)
- {
+ FOREACH_COLLECTION_BEGIN (bmain, scene, Collection *, collection) {
if (single_collection && collection != single_collection)
continue;
if (!BKE_collection_has_object(collection, ob))
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index c571fc6821e..39eb4b9333c 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1479,8 +1479,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
Object *prev_ob = NULL;
/* free constraints for all selected bones */
- CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
- {
+ CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
BKE_constraints_free(&pchan->constraints);
pchan->constflag &= ~(PCHAN_HAS_IK | PCHAN_HAS_SPLINEIK | PCHAN_HAS_CONST);
@@ -1561,8 +1560,7 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op)
Object *prev_ob = NULL;
/* copy all constraints from active posebone to all selected posebones */
- CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, chan, selected_pose_bones, Object *, ob)
- {
+ CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, chan, selected_pose_bones, Object *, ob) {
/* if we're not handling the object we're copying from, copy all constraints over */
if (pchan != chan) {
BKE_constraints_copy(&chan->constraints, &pchan->constraints, true);
@@ -2129,8 +2127,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op))
Object *prev_ob = NULL;
/* only remove IK Constraints */
- CTX_DATA_BEGIN_WITH_ID(C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob)
- {
+ CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, selected_pose_bones, Object *, ob) {
bConstraint *con, *next;
/* TODO: should we be checking if these constraints were local before we try and remove them? */