Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-11 09:21:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-11 09:21:26 +0300
commitf2b5de6893abaab8505562421ba00ad420ac263e (patch)
tree637b0a3156538f71c787bdde8f875b8612379b22 /source/blender
parent6d155dc46206f69aa704c184d40f74274a4ec0cd (diff)
Cleanup: whitespace
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl3
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl3
-rw-r--r--source/blender/draw/modes/pose_mode.c6
3 files changed, 8 insertions, 4 deletions
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);