[Bf-blender-cvs] [efcfe0ffdfa] master: Cleanup: clang-format.
Bastien Montagne
noreply at git.blender.org
Tue Feb 18 16:39:39 CET 2020
Commit: efcfe0ffdfac45f56f1da5e74c9954f9c3db47a4
Author: Bastien Montagne
Date: Tue Feb 18 16:38:57 2020 +0100
Branches: master
https://developer.blender.org/rBefcfe0ffdfac45f56f1da5e74c9954f9c3db47a4
Cleanup: clang-format.
===================================================================
M source/blender/blenkernel/intern/sequencer.c
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 0713d08e2d9..e86563ea08c 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3657,11 +3657,11 @@ static ImBuf *do_render_strip_seqbase(const SeqRenderData *context,
}
ibuf = seq_render_strip_stack(context,
- state,
- seqbase,
- /* scene strips don't have their start taken into account */
- nr + offset,
- 0);
+ state,
+ seqbase,
+ /* scene strips don't have their start taken into account */
+ nr + offset,
+ 0);
}
return ibuf;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 9d5c07ef0f0..0b67644a0bc 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -183,10 +183,10 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
"Triangulate",
"Convert all polygons to triangles"},
{eModifierType_Weld,
- "WELD",
- ICON_AUTOMERGE_OFF,
- "Weld",
- "Find groups of vertices closer then dist and merges them together"},
+ "WELD",
+ ICON_AUTOMERGE_OFF,
+ "Weld",
+ "Find groups of vertices closer then dist and merges them together"},
{eModifierType_Wireframe,
"WIREFRAME",
ICON_MOD_WIREFRAME,
More information about the Bf-blender-cvs
mailing list