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>2020-05-08 12:02:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-05-08 12:02:03 +0300
commit32f7495e5a2debb0abefd4728d55a4dd2fa1f5c0 (patch)
tree90e327687a3cee9b9508f2a8a8affcb70b803110 /source/blender/editors
parentc532c6c10913540d748392b61d176ae7e65b8c38 (diff)
Cleanup: clang-format
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/gpencil/gpencil_armature.c2
-rw-r--r--source/blender/editors/mesh/editmesh_loopcut.c3
-rw-r--r--source/blender/editors/object/object_edit.c3
-rw-r--r--source/blender/editors/object/object_modifier.c4
-rw-r--r--source/blender/editors/physics/particle_edit.c7
5 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c
index f4af7035618..962a74d9e6f 100644
--- a/source/blender/editors/gpencil/gpencil_armature.c
+++ b/source/blender/editors/gpencil/gpencil_armature.c
@@ -591,7 +591,7 @@ static int gpencil_generate_weights_exec(bContext *C, wmOperator *op)
else {
/* get armature from modifier */
GpencilModifierData *md = BKE_gpencil_modifiers_findby_type(ob_eval,
- eGpencilModifierType_Armature);
+ eGpencilModifierType_Armature);
if (md == NULL) {
BKE_report(op->reports, RPT_ERROR, "The grease pencil object need an Armature modifier");
return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 28e0c40fe41..3861676c2cf 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -372,7 +372,8 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event)
if (is_interactive) {
for (uint base_index = 0; base_index < bases_len; base_index++) {
Object *ob_iter = bases[base_index]->object;
- if (BKE_modifiers_is_deformed_by_lattice(ob_iter) || BKE_modifiers_is_deformed_by_armature(ob_iter)) {
+ if (BKE_modifiers_is_deformed_by_lattice(ob_iter) ||
+ BKE_modifiers_is_deformed_by_armature(ob_iter)) {
BKE_report(
op->reports, RPT_WARNING, "Loop cut does not work well on deformed edit mesh display");
break;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 38a00a2a9a8..46837e4fdf3 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1429,7 +1429,8 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
if (ob) {
const bool use_mode_particle_edit = (BLI_listbase_is_empty(&ob->particlesystem) == false) ||
(ob->soft != NULL) ||
- (BKE_modifiers_findby_type(ob, eModifierType_Cloth) != NULL);
+ (BKE_modifiers_findby_type(ob, eModifierType_Cloth) !=
+ NULL);
while (input->identifier) {
if ((input->value == OB_MODE_EDIT && OB_TYPE_SUPPORT_EDITMODE(ob->type)) ||
(input->value == OB_MODE_POSE && (ob->type == OB_ARMATURE)) ||
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index a723739b28d..5cb4714dabf 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2700,8 +2700,8 @@ static int laplaciandeform_bind_exec(bContext *C, wmOperator *op)
lmd->flag |= MOD_LAPLACIANDEFORM_BIND;
}
- LaplacianDeformModifierData *lmd_eval = (LaplacianDeformModifierData *)BKE_modifier_get_evaluated(
- depsgraph, ob, &lmd->modifier);
+ LaplacianDeformModifierData *lmd_eval = (LaplacianDeformModifierData *)
+ BKE_modifier_get_evaluated(depsgraph, ob, &lmd->modifier);
lmd_eval->flag = lmd->flag;
/* Force modifier to run, it will call binding routine
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 84666cb6930..6cafc51231c 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2831,8 +2831,8 @@ static void remove_tagged_keys(Depsgraph *depsgraph, Object *ob, ParticleSystem
if (pe_x_mirror(ob)) {
/* mirror key tags */
ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
- ParticleSystemModifierData *psmd_eval = (ParticleSystemModifierData *)BKE_modifier_get_evaluated(
- depsgraph, ob, &psmd->modifier);
+ ParticleSystemModifierData *psmd_eval = (ParticleSystemModifierData *)
+ BKE_modifier_get_evaluated(depsgraph, ob, &psmd->modifier);
LOOP_POINTS {
LOOP_TAGGED_KEYS {
@@ -5127,7 +5127,8 @@ void PE_create_particle_edit(
int totpoint;
if (psmd != NULL) {
- psmd_eval = (ParticleSystemModifierData *)BKE_modifiers_findny_name(ob_eval, psmd->modifier.name);
+ psmd_eval = (ParticleSystemModifierData *)BKE_modifiers_findny_name(ob_eval,
+ psmd->modifier.name);
}
/* no psmd->dm happens in case particle system modifier is not enabled */