[Bf-blender-cvs] [3b48a2a72fa] blender2.8: Cleanup: indentation
Campbell Barton
noreply at git.blender.org
Mon Apr 16 17:27:03 CEST 2018
Commit: 3b48a2a72fa7316090da74dcea4a491ee8d93938
Author: Campbell Barton
Date: Mon Apr 16 17:26:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3b48a2a72fa7316090da74dcea4a491ee8d93938
Cleanup: indentation
===================================================================
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
M source/blender/editors/space_view3d/view3d_manipulator_ruler.c
M source/blender/gpu/intern/gpu_framebuffer.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 15b411280a5..7baf9a32482 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1423,7 +1423,7 @@ static void outliner_draw_tree_element(
/* Master collection can't expand/collapse. */
}
else if (te->subtree.first || (tselem->type == 0 && te->idcode == ID_SCE) || (te->flag & TE_LAZY_CLOSED)) {
- /* open/close icon, only when sublevels, except for scene */
+ /* open/close icon, only when sublevels, except for scene */
int icon_x = startx;
// icons a bit higher
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c b/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
index c3f8d92ed7f..06ac2f83ea7 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
@@ -143,9 +143,10 @@ static void axis_geom_draw(
madd_v3_v3fl(
center,
(float [3]){
- mpr->matrix_offset[0][2],
- mpr->matrix_offset[1][2],
- mpr->matrix_offset[2][2]},
+ mpr->matrix_offset[0][2],
+ mpr->matrix_offset[1][2],
+ mpr->matrix_offset[2][2],
+ },
0.08f);
imm_draw_cube_wire_3d(pos_id, center, size);
glDisable(GL_BLEND);
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
index f9955f29774..2e289770f13 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
@@ -924,8 +924,8 @@ static void manipulator_ruler_exit(bContext *C, wmManipulator *mpr, const bool c
ruler_item->flag &= ~RULERITEM_USE_ANGLE;
}
else {
- /* Not ideal, since the ruler isn't a mode and we don't want to override delete key
- * use dragging out of the view for removal. */
+ /* Not ideal, since the ruler isn't a mode and we don't want to override delete key
+ * use dragging out of the view for removal. */
ruler_item_remove(C, mgroup, ruler_item);
ruler_item = NULL;
mpr = NULL;
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index 8d8fb50d9b9..d31ba79d9ed 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -87,7 +87,7 @@ static GLenum convert_attachment_type_to_gl(GPUAttachmentType type)
[GPU_FB_COLOR_ATTACHMENT2] = GL_COLOR_ATTACHMENT2,
[GPU_FB_COLOR_ATTACHMENT3] = GL_COLOR_ATTACHMENT3,
[GPU_FB_COLOR_ATTACHMENT4] = GL_COLOR_ATTACHMENT4
- };
+ };
return table[type];
}
More information about the Bf-blender-cvs
mailing list