[Bf-blender-cvs] [02f28da187b] blender2.8: Cleanup: trailing spaces
Campbell Barton
noreply at git.blender.org
Sun Apr 22 08:46:55 CEST 2018
Commit: 02f28da187b744b3dea0d253b3d46d91b201a98d
Author: Campbell Barton
Date: Sun Apr 22 08:44:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB02f28da187b744b3dea0d253b3d46d91b201a98d
Cleanup: trailing spaces
Applied to newly added files in 2.8
===================================================================
M source/blender/blenkernel/intern/object_facemap.c
M source/blender/blenlib/BLI_memiter.h
M source/blender/draw/engines/eevee/eevee_engine.h
M source/blender/draw/engines/eevee/eevee_lut.h
M source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
M source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl
M source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl
M source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl
M source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl
M source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
M source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl
M source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl
M source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl
M source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl
M source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
M source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl
M source/blender/draw/engines/workbench/shaders/workbench_diffuse_lib.glsl
M source/blender/draw/engines/workbench/solid_flat_mode.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_impl_lattice.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/draw_mode_engines.h
M source/blender/draw/modes/overlay_mode.c
M source/blender/draw/modes/shaders/object_grid_frag.glsl
M source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl
M source/blender/editors/object/object_facemap_ops.c
M source/blender/editors/space_topbar/space_topbar.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/gpu/GPU_batch.h
M source/blender/gpu/GPU_immediate.h
M source/blender/gpu/intern/gpu_uniformbuffer.c
M source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
M source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl
M source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl
M source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
M source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl
M source/blender/nodes/shader/nodes/node_shader_eevee_specular.c
M source/blender/python/gawain/CMakeLists.txt
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c
index 1218dd376cb..ef254864d2e 100644
--- a/source/blender/blenkernel/intern/object_facemap.c
+++ b/source/blender/blenkernel/intern/object_facemap.c
@@ -5,7 +5,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
- *
+ *
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
@@ -57,7 +57,7 @@
static bool fmap_unique_check(void *arg, const char *name)
{
struct {Object *ob; void *fm; } *data = arg;
-
+
bFaceMap *fmap;
for (fmap = data->ob->fmaps.first; fmap; fmap = fmap->next) {
@@ -67,7 +67,7 @@ static bool fmap_unique_check(void *arg, const char *name)
}
}
}
-
+
return false;
}
@@ -112,18 +112,18 @@ void BKE_object_facemap_unique_name(Object *ob, bFaceMap *fmap)
bFaceMap *BKE_object_facemap_add_name(Object *ob, const char *name)
{
bFaceMap *fmap;
-
+
if (!ob || ob->type != OB_MESH)
return NULL;
-
+
fmap = MEM_callocN(sizeof(bFaceMap), __func__);
BLI_strncpy(fmap->name, name, sizeof(fmap->name));
BLI_addtail(&ob->fmaps, fmap);
-
+
ob->actfmap = BLI_listbase_count(&ob->fmaps);
-
+
BKE_object_facemap_unique_name(ob, fmap);
return fmap;
@@ -138,24 +138,24 @@ bFaceMap *BKE_object_facemap_add(Object *ob)
static void object_fmap_remove_edit_mode(Object *ob, bFaceMap *fmap, bool do_selected, bool purge)
{
const int fmap_nr = BLI_findindex(&ob->fmaps, fmap);
-
+
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
-
+
if (me->edit_btmesh) {
BMEditMesh *em = me->edit_btmesh;
const int cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
-
+
if (cd_fmap_offset != -1) {
BMFace *efa;
BMIter iter;
int *map;
-
+
if (purge) {
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
-
- if (map) {
+
+ if (map) {
if (*map == fmap_nr)
*map = -1;
else if (*map > fmap_nr)
@@ -166,7 +166,7 @@ static void object_fmap_remove_edit_mode(Object *ob, bFaceMap *fmap, bool do_sel
else {
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset);
-
+
if (map && *map == fmap_nr && (!do_selected || BM_elem_flag_test(efa, BM_ELEM_SELECT))) {
*map = -1;
}
@@ -176,7 +176,7 @@ static void object_fmap_remove_edit_mode(Object *ob, bFaceMap *fmap, bool do_sel
if (ob->actfmap == BLI_listbase_count(&ob->fmaps))
ob->actfmap--;
-
+
BLI_remlink(&ob->fmaps, fmap);
MEM_freeN(fmap);
}
@@ -186,14 +186,14 @@ static void object_fmap_remove_edit_mode(Object *ob, bFaceMap *fmap, bool do_sel
static void object_fmap_remove_object_mode(Object *ob, bFaceMap *fmap, bool purge)
{
const int fmap_nr = BLI_findindex(&ob->fmaps, fmap);
-
+
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
-
+
if (CustomData_has_layer(&me->pdata, CD_FACEMAP)) {
int *map = CustomData_get_layer(&me->pdata, CD_FACEMAP);
int i;
-
+
if (map) {
for (i = 0; i < me->totpoly; i++) {
if (map[i] == fmap_nr)
@@ -206,7 +206,7 @@ static void object_fmap_remove_object_mode(Object *ob, bFaceMap *fmap, bool purg
if (ob->actfmap == BLI_listbase_count(&ob->fmaps))
ob->actfmap--;
-
+
BLI_remlink(&ob->fmaps, fmap);
MEM_freeN(fmap);
}
diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h
index b16f1ae8c43..55eb023313d 100644
--- a/source/blender/blenlib/BLI_memiter.h
+++ b/source/blender/blenlib/BLI_memiter.h
@@ -17,7 +17,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_MEMITER_H__
#define __BLI_MEMITER_H__
diff --git a/source/blender/draw/engines/eevee/eevee_engine.h b/source/blender/draw/engines/eevee/eevee_engine.h
index 0cbd89a79fa..b7de3a055b9 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.h
+++ b/source/blender/draw/engines/eevee/eevee_engine.h
@@ -28,4 +28,4 @@
extern RenderEngineType DRW_engine_viewport_eevee_type;
-#endif /* __EEVEE_ENGINE_H__ */
\ No newline at end of file
+#endif /* __EEVEE_ENGINE_H__ */
diff --git a/source/blender/draw/engines/eevee/eevee_lut.h b/source/blender/draw/engines/eevee/eevee_lut.h
index 3c2ffeb11a7..da765b3e53a 100644
--- a/source/blender/draw/engines/eevee/eevee_lut.h
+++ b/source/blender/draw/engines/eevee/eevee_lut.h
@@ -4203,7 +4203,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f,
- 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+ 1.000000f, 1.000000f, 1.000000f, 1.000000f,
},
{
0.000122f, 0.999512f, 0.999512f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
@@ -4547,7 +4547,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.995605f, 0.995117f,
- 0.995117f, 0.995605f, 0.995117f, 0.995117f,
+ 0.995117f, 0.995605f, 0.995117f, 0.995117f,
},
{
0.003168f, 0.995605f, 0.998535f, 0.999512f, 0.999512f, 0.999512f, 0.999512f, 0.999512f, 0.999512f, 0.999512f, 0.999512f, 0.999512f,
@@ -4891,7 +4891,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.940430f, 0.940430f,
- 0.940918f, 0.940918f, 0.940430f, 0.940430f,
+ 0.940918f, 0.940918f, 0.940430f, 0.940430f,
},
{
0.014023f, 0.979492f, 0.994629f, 0.997070f, 0.998047f, 0.998535f, 0.999023f, 0.999023f, 0.999023f, 0.999023f, 0.999512f, 0.999512f,
@@ -5235,7 +5235,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000022f, 0.818848f, 0.819824f,
- 0.819336f, 0.819824f, 0.819824f, 0.819824f,
+ 0.819336f, 0.819824f, 0.819824f, 0.819824f,
},
{
0.038849f, 0.941406f, 0.984375f, 0.992188f, 0.994141f, 0.996094f, 0.996582f, 0.997070f, 0.998047f, 0.998047f, 0.998047f, 0.998535f,
@@ -5579,7 +5579,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000017f, 0.711914f, 0.712402f,
- 0.711426f, 0.711426f, 0.711914f, 0.712402f,
+ 0.711426f, 0.711426f, 0.711914f, 0.712402f,
},
{
0.076172f, 0.877441f, 0.964355f, 0.980957f, 0.987305f, 0.990723f, 0.992676f, 0.993652f, 0.994629f, 0.995605f, 0.996094f, 0.996582f,
@@ -5923,7 +5923,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000014f, 0.000007f, 0.642578f, 0.643555f,
- 0.643066f, 0.643555f, 0.642578f, 0.642578f,
+ 0.643066f, 0.643555f, 0.642578f, 0.642578f,
},
{
0.113464f, 0.797852f, 0.930176f, 0.961914f, 0.974609f, 0.980469f, 0.984863f, 0.987793f, 0.989258f, 0.991211f, 0.992188f, 0.993164f,
@@ -6267,7 +6267,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000006f, 0.000011f, 0.000009f, 0.600586f, 0.602051f,
- 0.602051f, 0.601562f, 0.601074f, 0.601074f,
+ 0.602051f, 0.601562f, 0.601074f, 0.601074f,
},
{
0.142456f, 0.713867f, 0.883789f, 0.933105f, 0.953613f, 0.964844f, 0.972168f, 0.977539f, 0.980957f, 0.983398f, 0.985352f, 0.987305f,
@@ -6611,7 +6611,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.0000
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list