[Bf-blender-cvs] [72351aec728] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Fri Nov 8 01:55:05 CET 2019
Commit: 72351aec728d5df59b4ce98271a5219e7e3d9c54
Author: Campbell Barton
Date: Fri Nov 8 11:50:16 2019 +1100
Branches: master
https://developer.blender.org/rB72351aec728d5df59b4ce98271a5219e7e3d9c54
Cleanup: clang-format
===================================================================
M source/blender/blenkernel/intern/smoke.c
M source/blender/editors/gpencil/gpencil_paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index de81e150074..4c3b7a619da 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2555,13 +2555,8 @@ static void update_flowsfluids(
/* update flow object frame */
BLI_mutex_lock(&object_update_lock);
- BKE_object_modifier_update_subframe(depsgraph,
- scene,
- collob,
- true,
- 5,
- BKE_scene_frame_get(scene),
- eModifierType_Smoke);
+ BKE_object_modifier_update_subframe(
+ depsgraph, scene, collob, true, 5, BKE_scene_frame_get(scene), eModifierType_Smoke);
BLI_mutex_unlock(&object_update_lock);
if (sfs->source == MOD_SMOKE_FLOW_SOURCE_PARTICLES) {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 2a68d93efb4..67830d0e501 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -3296,7 +3296,8 @@ static void gpencil_guide_event_handling(bContext *C,
/* Enter or exit set center point mode */
if ((event->type == OKEY) && (event->val == KM_RELEASE)) {
- if ((p->paintmode == GP_PAINTMODE_DRAW) && guide->use_guide && (guide->reference_point != GP_GUIDE_REF_OBJECT)) {
+ if ((p->paintmode == GP_PAINTMODE_DRAW) && guide->use_guide &&
+ (guide->reference_point != GP_GUIDE_REF_OBJECT)) {
add_notifier = true;
p->paintmode = GP_PAINTMODE_SET_CP;
ED_gpencil_toggle_brush_cursor(C, false, NULL);
More information about the Bf-blender-cvs
mailing list