[Bf-blender-cvs] [f2b5de6893a] blender2.8: Cleanup: whitespace

Campbell Barton noreply at git.blender.org
Fri May 11 08:22:21 CEST 2018


Commit: f2b5de6893abaab8505562421ba00ad420ac263e
Author: Campbell Barton
Date:   Fri May 11 08:21:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf2b5de6893abaab8505562421ba00ad420ac263e

Cleanup: whitespace

===================================================================

M	source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
M	source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
M	source/blender/draw/modes/pose_mode.c

===================================================================

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
index f96f5ff0af7..7f7e8f9c69c 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
@@ -30,7 +30,8 @@ void main()
 		vec3 background = background_color(world_data, uv_viewport.y);
 		if (object_overlap == 0.0) {
 			fragColor = vec4(background, 0.0);
-		} else {
+		}
+		else {
 			fragColor = vec4(mix(objectOverlapColor, background, object_overlap), 1.0-object_overlap);
 		}
 		return;
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
index 7853e361172..54c5bce4271 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
@@ -36,7 +36,8 @@ void main()
 	if (!gl_FrontFacing) {
 		normalViewport = normal_encode(-normal_viewport);
 		diffuseColor.a = 1.0;
-	} else {
+	}
+	else {
 		normalViewport = normal_encode(normal_viewport);
 		diffuseColor.a = 0.0;
 	}
diff --git a/source/blender/draw/modes/pose_mode.c b/source/blender/draw/modes/pose_mode.c
index 19a93c8c52d..dcc8c264764 100644
--- a/source/blender/draw/modes/pose_mode.c
+++ b/source/blender/draw/modes/pose_mode.c
@@ -169,7 +169,8 @@ static bool POSE_is_driven_by_active_armature(Object *ob)
 			is_active = DRW_pose_mode_armature(armature->proxy_from, draw_ctx->obact);
 		}
 		return is_active;
-	} else {
+	}
+	else {
 		Object *meshDeform = modifiers_isDeformedByMeshDeform(ob);
 		if (meshDeform) {
 			return POSE_is_driven_by_active_armature(meshDeform);
@@ -200,7 +201,8 @@ static void POSE_cache_populate(void *vedata, Object *ob)
 			};
 			DRW_shgroup_armature_pose(ob, passes);
 		}
-	} else if (ob->type == OB_MESH && POSE_is_bone_selection_overlay_active() && POSE_is_driven_by_active_armature(ob)) {
+	}
+	else if (ob->type == OB_MESH && POSE_is_bone_selection_overlay_active() && POSE_is_driven_by_active_armature(ob)) {
 		struct Gwn_Batch *geom = DRW_cache_object_surface_get(ob);
 		if (geom) {
 			DRW_shgroup_call_object_add(stl->g_data->bone_selection_shgrp, geom, ob);



More information about the Bf-blender-cvs mailing list