[Bf-blender-cvs] [d9f4ce617b8] blender2.8: Cleanup: trailing space
Campbell Barton
noreply at git.blender.org
Thu May 3 07:22:40 CEST 2018
Commit: d9f4ce617b8ff0e52f0e87fa848d50fbccad4448
Author: Campbell Barton
Date: Thu May 3 07:22:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd9f4ce617b8ff0e52f0e87fa848d50fbccad4448
Cleanup: trailing space
===================================================================
M source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/intern/draw_armature.c
===================================================================
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
index 1902a9587d2..5fcadc21a2c 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
@@ -49,4 +49,4 @@ vec3 linearrgb_to_srgb(vec3 rgb) {
linear_to_srgb(rgb.g),
linear_to_srgb(rgb.b)
);
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index 65a331e1777..b095890f873 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -380,7 +380,7 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob
if (ob->type == OB_MESH) {
workbench_cache_populate_particles(vedata, props, ob);
}
-
+
WORKBENCH_MaterialData *material;
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
const DRWContextState *draw_ctx = DRW_context_state_get();
@@ -399,7 +399,7 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob
DRW_shgroup_call_object_add(material->shgrp, geom, ob);
}
}
- }
+ }
else { /* MATERIAL colors */
const int materials_len = MAX2(1, (is_sculpt_mode ? 1 : ob->totcol));
struct GPUMaterial **gpumat_array = BLI_array_alloca(gpumat_array, materials_len);
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 6405cff86e7..3b61d21849e 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -293,7 +293,7 @@ static void drw_shgroup_bone_envelope_head_wire(
if (g_data.bone_point_wire == NULL) {
g_data.bone_point_wire = shgroup_instance_bone_sphere_outline(g_data.pass_bone_wire);
}
-
+
float head_sphere[4] = {0.0f, 0.0f, 0.0f, 1.0f}, tail_sphere[4] = {0.0f, 1.0f, 0.0f, 1.0f};
float final_bonemat[4][4];
mul_m4_m4m4(final_bonemat, g_data.ob->obmat, bone_mat);
More information about the Bf-blender-cvs
mailing list