bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton 2019-11-08 11:50:16 +11:00
parent 8d8c4562cc
commit 72351aec72
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/smoke.c
View File

@ -2555,13 +2555,8 @@ static void update_flowsfluids(
/* update flow object frame */ /* update flow object frame */
BLI_mutex_lock(&object_update_lock); BLI_mutex_lock(&object_update_lock);
BKE_object_modifier_update_subframe(depsgraph, BKE_object_modifier_update_subframe(
scene, depsgraph, scene, collob, true, 5, BKE_scene_frame_get(scene), eModifierType_Smoke);
collob,
true,
5,
BKE_scene_frame_get(scene),
eModifierType_Smoke);
BLI_mutex_unlock(&object_update_lock); BLI_mutex_unlock(&object_update_lock);
if (sfs->source == MOD_SMOKE_FLOW_SOURCE_PARTICLES) { if (sfs->source == MOD_SMOKE_FLOW_SOURCE_PARTICLES) {

3
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -3296,7 +3296,8 @@ static void gpencil_guide_event_handling(bContext *C,
/* Enter or exit set center point mode */ /* Enter or exit set center point mode */
if ((event->type == OKEY) && (event->val == KM_RELEASE)) { 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; add_notifier = true;
p->paintmode = GP_PAINTMODE_SET_CP; p->paintmode = GP_PAINTMODE_SET_CP;
ED_gpencil_toggle_brush_cursor(C, false, NULL); ED_gpencil_toggle_brush_cursor(C, false, NULL);