diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-27 13:27:34 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-27 13:27:34 +0300 |
commit | 3cf6516e7b917bd81d7147b57baafe2495c759f4 (patch) | |
tree | 33da220c47c92b1d231e576dfc246dd424632498 /source | |
parent | 9130a60d3d833718c932d3f971b746ba253734bc (diff) |
Cleanup: format
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 5 | ||||
-rw-r--r-- | source/blender/gpu/metal/mtl_context.mm | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl index 0a498471b46..e1a4a3602e3 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl @@ -1,4 +1,4 @@ void main() { fragColor = color; -}
\ No newline at end of file +} diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 5ea42a5efa5..a0d540d152b 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1288,7 +1288,10 @@ void SCULPT_orig_vert_data_unode_init(SculptOrigVertData *data, Object *ob, Scul } } -void SCULPT_orig_vert_data_init(SculptOrigVertData *data, Object *ob, PBVHNode *node, SculptUndoType type) +void SCULPT_orig_vert_data_init(SculptOrigVertData *data, + Object *ob, + PBVHNode *node, + SculptUndoType type) { SculptUndoNode *unode; unode = SCULPT_undo_push_node(ob, node, type); diff --git a/source/blender/gpu/metal/mtl_context.mm b/source/blender/gpu/metal/mtl_context.mm index 64a44c6f718..4a76bab11b8 100644 --- a/source/blender/gpu/metal/mtl_context.mm +++ b/source/blender/gpu/metal/mtl_context.mm @@ -193,7 +193,7 @@ id<MTLRenderCommandEncoder> MTLContext::ensure_begin_render_pass() /* Ensure command buffer workload submissions are optimal -- * Though do not split a batch mid-IMM recording */ /* TODO(Metal): Add IMM Check once MTLImmediate has been implemented. */ - if (this->main_command_buffer.do_break_submission()/*&& + if (this->main_command_buffer.do_break_submission()/*&& !((MTLImmediate *)(this->imm))->imm_is_recording()*/) { this->flush(); } |