diff options
61 files changed, 182 insertions, 182 deletions
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.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.000004f, 0.000011f, 0.000006f, 0.000007f, 0.575195f, 0.575195f, - 0.575195f, 0.575195f, 0.575195f, 0.575195f, + 0.575195f, 0.575195f, 0.575195f, 0.575195f, }, { 0.158813f, 0.632812f, 0.824219f, 0.891602f, 0.924805f, 0.942383f, 0.954102f, 0.962402f, 0.968262f, 0.972656f, 0.976074f, 0.978516f, @@ -6955,7 +6955,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.000003f, 0.000009f, 0.000006f, 0.000004f, 0.000007f, 0.557129f, 0.558105f, - 0.557617f, 0.557617f, 0.558594f, 0.558105f, + 0.557617f, 0.557617f, 0.558594f, 0.558105f, }, { 0.163818f, 0.558105f, 0.755859f, 0.841797f, 0.886230f, 0.912109f, 0.929199f, 0.941406f, 0.950195f, 0.957031f, 0.961914f, 0.966309f, @@ -7299,7 +7299,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.000003f, 0.000007f, 0.000006f, 0.000004f, 0.000005f, 0.000007f, 0.543945f, 0.545410f, - 0.545410f, 0.545410f, 0.546387f, 0.545898f, + 0.545410f, 0.545410f, 0.546387f, 0.545898f, }, { 0.159546f, 0.492676f, 0.684570f, 0.783203f, 0.838379f, 0.873535f, 0.897949f, 0.913574f, 0.926270f, 0.936035f, 0.943359f, 0.950195f, @@ -7643,7 +7643,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.000001f, 0.000003f, 0.000006f, 0.000005f, 0.000004f, 0.000003f, 0.000004f, 0.000008f, 0.534668f, 0.536621f, - 0.537109f, 0.537109f, 0.536621f, 0.536621f, + 0.537109f, 0.537109f, 0.536621f, 0.536621f, }, { 0.149292f, 0.432373f, 0.614258f, 0.719238f, 0.784180f, 0.826660f, 0.856934f, 0.879883f, 0.896484f, 0.909180f, 0.919922f, 0.928711f, @@ -7987,7 +7987,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.000002f, 0.000004f, 0.000005f, 0.000004f, 0.000004f, 0.000003f, 0.000003f, 0.000004f, 0.000009f, 0.527344f, 0.529785f, - 0.529785f, 0.530273f, 0.530762f, 0.530762f, + 0.529785f, 0.530273f, 0.530762f, 0.530762f, }, { 0.135132f, 0.377441f, 0.544434f, 0.653320f, 0.724609f, 0.773926f, 0.811035f, 0.838867f, 0.860840f, 0.876465f, 0.891113f, 0.902832f, @@ -8331,7 +8331,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.000001f, 0.000002f, 0.000004f, 0.000004f, 0.000004f, 0.000003f, 0.000003f, 0.000002f, 0.000004f, 0.000003f, 0.000011f, 0.520020f, 0.523926f, - 0.524902f, 0.524902f, 0.524902f, 0.524902f, + 0.524902f, 0.524902f, 0.524902f, 0.524902f, }, { 0.119934f, 0.328857f, 0.480713f, 0.586914f, 0.663086f, 0.717773f, 0.759766f, 0.791504f, 0.818359f, 0.838867f, 0.856934f, 0.871094f, @@ -8675,7 +8675,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.000001f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000003f, 0.000003f, 0.000003f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000012f, 0.513672f, 0.520020f, - 0.520020f, 0.520508f, 0.521484f, 0.521484f, + 0.520020f, 0.520508f, 0.521484f, 0.521484f, }, { 0.103943f, 0.284912f, 0.422119f, 0.523438f, 0.600586f, 0.659668f, 0.705078f, 0.741699f, 0.771484f, 0.795898f, 0.816895f, 0.834961f, @@ -9019,7 +9019,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.000001f, 0.000001f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000003f, 0.000003f, 0.000002f, 0.000002f, 0.000001f, 0.000003f, 0.000003f, 0.000004f, 0.000014f, 0.506836f, 0.515137f, - 0.516113f, 0.516602f, 0.517090f, 0.517578f, + 0.516113f, 0.516602f, 0.517090f, 0.517578f, }, { 0.089539f, 0.244873f, 0.368164f, 0.464355f, 0.539551f, 0.599121f, 0.648438f, 0.688477f, 0.721680f, 0.749512f, 0.772461f, 0.793945f, @@ -9363,7 +9363,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.000001f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000003f, 0.000003f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000016f, 0.499756f, 0.510254f, - 0.513184f, 0.513672f, 0.514160f, 0.514160f, + 0.513184f, 0.513672f, 0.514160f, 0.514160f, }, { 0.076172f, 0.209839f, 0.320312f, 0.408691f, 0.481689f, 0.541016f, 0.591309f, 0.633789f, 0.668945f, 0.699707f, 0.727051f, 0.749512f, @@ -9707,7 +9707,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.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000003f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000017f, 0.491211f, 0.506348f, - 0.508789f, 0.510254f, 0.510254f, 0.510742f, + 0.508789f, 0.510254f, 0.510254f, 0.510742f, }, { 0.064758f, 0.179688f, 0.277344f, 0.358398f, 0.427002f, 0.485107f, 0.535156f, 0.578613f, 0.615234f, 0.647949f, 0.677734f, 0.703125f, @@ -10051,7 +10051,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.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000005f, 0.000018f, 0.481934f, 0.500977f, - 0.504883f, 0.505859f, 0.507324f, 0.507812f, + 0.504883f, 0.505859f, 0.507324f, 0.507812f, }, { 0.053833f, 0.152832f, 0.239014f, 0.313477f, 0.377686f, 0.433838f, 0.481689f, 0.524414f, 0.562988f, 0.596680f, 0.626953f, 0.654785f, @@ -10395,7 +10395,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.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000005f, 0.000021f, 0.473145f, 0.495605f, - 0.500000f, 0.502441f, 0.503418f, 0.503906f, + 0.500000f, 0.502441f, 0.503418f, 0.503906f, }, { 0.045868f, 0.130493f, 0.205322f, 0.272705f, 0.331787f, 0.384521f, 0.431885f, 0.473389f, 0.511719f, 0.545898f, 0.576660f, 0.605469f, @@ -10739,7 +10739,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.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000004f, 0.000006f, 0.000022f, 0.460449f, 0.489258f, - 0.495850f, 0.498291f, 0.499512f, 0.500000f, + 0.495850f, 0.498291f, 0.499512f, 0.500000f, }, { 0.038544f, 0.111450f, 0.177368f, 0.237061f, 0.290771f, 0.339600f, 0.384277f, 0.425293f, 0.462402f, 0.497070f, 0.527344f, 0.556152f, @@ -11083,7 +11083,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.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000004f, 0.000006f, 0.000023f, 0.446777f, 0.482178f, - 0.489746f, 0.492676f, 0.494629f, 0.496094f, + 0.489746f, 0.492676f, 0.494629f, 0.496094f, }, { 0.032318f, 0.095032f, 0.152344f, 0.205322f, 0.254883f, 0.299316f, 0.342041f, 0.380859f, 0.416504f, 0.449707f, 0.481201f, 0.508789f, @@ -11427,7 +11427,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000007f, 0.000024f, 0.432129f, 0.474121f, - 0.482666f, 0.486572f, 0.489014f, 0.490234f, + 0.482666f, 0.486572f, 0.489014f, 0.490234f, }, { 0.027573f, 0.080750f, 0.130981f, 0.177734f, 0.222290f, 0.263672f, 0.302002f, 0.338623f, 0.373291f, 0.405029f, 0.435791f, 0.464111f, @@ -11771,7 +11771,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000000f, 0.000000f, 0.000000f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000004f, 0.000004f, 0.000007f, 0.000025f, 0.416016f, 0.464111f, - 0.474854f, 0.479248f, 0.481934f, 0.484375f, + 0.474854f, 0.479248f, 0.481934f, 0.484375f, }, { 0.023209f, 0.069336f, 0.113037f, 0.154663f, 0.193726f, 0.231812f, 0.267578f, 0.301758f, 0.333740f, 0.364258f, 0.393555f, 0.421631f, @@ -12115,7 +12115,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000000f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000005f, 0.000008f, 0.000026f, 0.398926f, 0.452881f, - 0.465576f, 0.471436f, 0.474854f, 0.477051f, + 0.465576f, 0.471436f, 0.474854f, 0.477051f, }, { 0.019653f, 0.058990f, 0.097473f, 0.134277f, 0.169189f, 0.203491f, 0.236450f, 0.267578f, 0.297852f, 0.326416f, 0.354004f, 0.380859f, @@ -12459,7 +12459,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000004f, 0.000004f, 0.000005f, 0.000009f, 0.000027f, 0.381348f, 0.441406f, - 0.455566f, 0.462891f, 0.466309f, 0.468994f, + 0.455566f, 0.462891f, 0.466309f, 0.468994f, }, { 0.016769f, 0.050629f, 0.083740f, 0.116638f, 0.148071f, 0.178955f, 0.208374f, 0.236938f, 0.265137f, 0.291992f, 0.317871f, 0.343994f, @@ -12803,7 +12803,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000005f, 0.000010f, 0.000027f, 0.363037f, 0.428223f, - 0.444580f, 0.452881f, 0.457031f, 0.459961f, + 0.444580f, 0.452881f, 0.457031f, 0.459961f, }, { 0.014420f, 0.043488f, 0.072388f, 0.100830f, 0.129150f, 0.156494f, 0.183350f, 0.210327f, 0.235352f, 0.260986f, 0.285645f, 0.309082f, @@ -13147,7 +13147,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000006f, 0.000010f, 0.000027f, 0.343750f, 0.414795f, - 0.433105f, 0.441895f, 0.446289f, 0.449951f, + 0.433105f, 0.441895f, 0.446289f, 0.449951f, }, { 0.012436f, 0.037598f, 0.062805f, 0.087891f, 0.113037f, 0.137329f, 0.161621f, 0.185425f, 0.209717f, 0.232544f, 0.255371f, 0.278076f, @@ -13491,7 +13491,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000004f, 0.000006f, 0.000010f, 0.000026f, 0.324219f, 0.399902f, - 0.419922f, 0.429688f, 0.435059f, 0.438965f, + 0.419922f, 0.429688f, 0.435059f, 0.438965f, }, { 0.010521f, 0.032043f, 0.054443f, 0.076843f, 0.098572f, 0.121216f, 0.142700f, 0.164062f, 0.185913f, 0.207275f, 0.229004f, 0.249268f, @@ -13835,7 +13835,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000004f, 0.000007f, 0.000010f, 0.000026f, 0.305420f, 0.384277f, - 0.405762f, 0.416504f, 0.423340f, 0.427246f, + 0.405762f, 0.416504f, 0.423340f, 0.427246f, }, { 0.009338f, 0.028412f, 0.047394f, 0.066895f, 0.086548f, 0.105774f, 0.125854f, 0.145142f, 0.165039f, 0.184570f, 0.204712f, 0.223389f, @@ -14179,7 +14179,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000004f, 0.000004f, 0.000004f, 0.000005f, 0.000007f, 0.000011f, 0.000026f, 0.286621f, 0.368896f, - 0.391846f, 0.402588f, 0.409912f, 0.414551f, + 0.391846f, 0.402588f, 0.409912f, 0.414551f, }, { 0.007935f, 0.024429f, 0.041290f, 0.058838f, 0.076355f, 0.093933f, 0.111145f, 0.128174f, 0.146606f, 0.164429f, 0.182617f, 0.200562f, @@ -14523,7 +14523,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000005f, 0.000005f, 0.000008f, 0.000012f, 0.000026f, 0.267822f, 0.353027f, - 0.376953f, 0.388916f, 0.395996f, 0.401367f, + 0.376953f, 0.388916f, 0.395996f, 0.401367f, }, { 0.006824f, 0.021286f, 0.036285f, 0.051208f, 0.066467f, 0.082825f, 0.098694f, 0.114563f, 0.130737f, 0.146973f, 0.162720f, 0.179932f, @@ -14867,7 +14867,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = { 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000001f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000002f, 0.000003f, 0.000003f, 0.000004f, 0.000004f, 0.000005f, 0.000006f, 0.000009f, 0.000012f, 0.000026f, 0.249878f, 0.336182f, - 0.362061f, 0.374512f, 0.382080f, 0.387695f, + 0.362061f, 0.374512f, 0.382080f, 0.387695f, } }; diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl index 9f4f508d6fd..80d305cb1e8 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl @@ -823,4 +823,4 @@ void main() Closure cl = nodetree_exec(); fragColor = vec4(mix(vec3(1.0), cl.radiance, cl.opacity), 1.0); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl index ddc7327334c..d5b54097638 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl @@ -153,4 +153,4 @@ vec3 direct_ggx_unit_disc(LightData ld, vec3 N, vec3 V, float roughness, vec3 f0 return spec; } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl index b8fac61519e..7fb4ee51a96 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl @@ -43,4 +43,4 @@ void main() { fresnel_accum /= sampleCount; FragColor = vec4(brdf_accum, fresnel_accum, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl index e5c0cb9c9c9..cce9d59dc12 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl @@ -104,4 +104,4 @@ vec3 sample_cone(float nsample, float angle, vec3 N, vec3 T, vec3 B) return tangent_to_world(Ht, N, T, B); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl b/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl index 2c604d69641..5f0af6a6f5b 100644 --- a/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl @@ -56,4 +56,4 @@ void main() { btdf_accum /= sampleCount; FragColor = vec4(btdf_accum, 0.0, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl index 37106fc32bd..d6abb7dc175 100644 --- a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl @@ -52,4 +52,4 @@ layout(std140) uniform common_block { /* ssrParameters */ #define ssrQuality ssrParameters.x #define ssrThickness ssrParameters.y -#define ssrPixelSize ssrParameters.zw
\ No newline at end of file +#define ssrPixelSize ssrParameters.zw diff --git a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl b/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl index 67bcf603a81..7de27a9fda9 100644 --- a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl @@ -264,4 +264,4 @@ vec2[CONCENTRIC_SAMPLE_NUM]( vec2(0.905555462146, -0.242642854784), vec2(0.925957819308, -0.146657310975), vec2(0.936215188832, -0.0490649589778) -);
\ No newline at end of file +); diff --git a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl index 29543e82f43..c3674c8f74c 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl @@ -215,4 +215,4 @@ void main(void) #elif defined(STEP_RESOLVE) FragColor = step_resolve(); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl index 0f5c5e5b16b..05f5eb78253 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl @@ -96,4 +96,4 @@ void main() #elif defined(STEP_RESOLVE) passthrough(); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl index eb463d51146..79f86cfae58 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl @@ -27,4 +27,4 @@ void main() vec3 cubevec = x_axis[fFace] * uvs.x + y_axis[fFace] * uvs.y + maj_axes[fFace]; FragColor = textureLod(source, cubevec, 0.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl index 156be108a14..8f06e161a20 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl @@ -34,4 +34,4 @@ void main() float luma = max(1e-8, brightness(FragColor.rgb)); FragColor *= 1.0 - max(0.0, luma - fireflyFactor) / luma; #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl index c11dbdd59ad..24dbb5436d9 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl @@ -93,4 +93,4 @@ void main() fragColor = vec4(val); #endif gl_FragDepth = val; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl index aa88e365d93..6c21d7d6fef 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl @@ -502,7 +502,7 @@ void main() if (weight_acc > 0.0) { ssr_accum /= weight_acc; /* fade between 0.5 and 1.0 roughness */ - ssr_accum.a *= smoothstep(ssrMaxRoughness + 0.2, ssrMaxRoughness, roughness); + ssr_accum.a *= smoothstep(ssrMaxRoughness + 0.2, ssrMaxRoughness, roughness); accumulate_light(ssr_accum.rgb, ssr_accum.a, spec_accum); } diff --git a/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl b/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl index b3b94b0a391..d4fbac21563 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl @@ -99,4 +99,4 @@ void main() vec4 color_history = texelFetch(colorHistoryBuffer, texel, 0); FragColor = mix(color_history, color, alpha); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl index 57da4d0d1ec..b0a6cbe1707 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl @@ -23,4 +23,4 @@ void main() worldPosition = wpos.xyz; gl_Position = ViewProjectionMatrix * wpos; worldNormal = normalize(pos); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl index b19ee7a9ea3..14fd6d3dff5 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl @@ -195,4 +195,4 @@ void main() FragColor = irradiance_encode(intensityFac * out_radiance / weight); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl index 3aec3ce4642..e4199e6a5ed 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl @@ -84,4 +84,4 @@ void main() { } FragColor = vec4(intensityFac * out_radiance / weight, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl index 0727e73f507..211fa8f0ce8 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl @@ -85,4 +85,4 @@ void main() /* Encode to normalized RGBA 8 */ FragColor = visibility_encode(accum, visibilityRange); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl index 7e63f4cdaf7..2ce37d867b7 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl @@ -31,4 +31,4 @@ void main() { } EndPrimitive(); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl index 37f73714a8e..a017a791e41 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl @@ -29,4 +29,4 @@ void main() gl_Position = ViewProjectionMatrix * vec4(pos * 0.02 * sphere_size + ws_cell_location, 1.0); worldNormal = normalize(pos); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl index c9e66ceffb2..ced8e7f4f01 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl @@ -17,4 +17,4 @@ void main() if (any(greaterThanEqual(ivec2(gl_FragCoord.xy), data_size))) { FragColor = vec4(0.0, 0.0, 0.0, 1.0); } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl index 3ecd85fd72e..a71a3bef1e1 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl @@ -12,4 +12,4 @@ void main() gl_Position = ViewProjectionMatrix * probe_mat * vec4(pos, 1.0); worldPosition = (probe_mat * vec4(pos, 1.0)).xyz; probeIdx = probe_id; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl index 3b3abdef00c..d629195b815 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl @@ -37,4 +37,4 @@ void main() float luma = max(1e-8, brightness(FragColor.rgb)); FragColor *= 1.0 - max(0.0, luma - fireflyFactor) / luma; #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl index 23c16f0fa30..721cc8789a0 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl @@ -21,4 +21,4 @@ void main() { EmitVertex(); EndPrimitive(); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl index ac4e3da4158..d682e39d8ad 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl @@ -7,4 +7,4 @@ out vec2 vPos; void main() { instance = gl_InstanceID; vPos = pos; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl index f5077d52845..bbb77af673a 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl @@ -7,4 +7,4 @@ flat out int face; void main() { vPos = vec4(pos, 1.0); face = gl_InstanceID; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl index d25c49098a6..cbc4c80e59b 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl @@ -40,4 +40,4 @@ void main() { #ifdef ATTRIB pass_attrib(pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl index 9fa57b8e136..6b6479089f6 100644 --- a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl @@ -30,4 +30,4 @@ void main() { pass_attrib(pos); #endif #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl index 15e9696a4c5..c5c97b97734 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl @@ -60,4 +60,4 @@ void main() finalTransmittance *= Tr; } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/workbench/shaders/workbench_diffuse_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_diffuse_lib.glsl index 22a55a386f7..ab060745060 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_diffuse_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_diffuse_lib.glsl @@ -18,4 +18,4 @@ vec3 get_world_diffuse_light(vec3 N, vec3 xp, vec3 xn, vec3 yp, vec3 yn, vec3 zp result = mix(result, zp, normalized_dot(vec3( 0.0, 0.0, 1.0), N)); result = mix(result, zn, normalized_dot(vec3( 0.0, 0.0, -1.0), N)); return result; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/workbench/solid_flat_mode.c b/source/blender/draw/engines/workbench/solid_flat_mode.c index e98783446d6..7b096ad7a25 100644 --- a/source/blender/draw/engines/workbench/solid_flat_mode.c +++ b/source/blender/draw/engines/workbench/solid_flat_mode.c @@ -82,7 +82,7 @@ static void workbench_solid_flat_draw_scene(void *vedata) DRW_draw_pass(psl->depth_pass); DRW_draw_pass(psl->solid_pass); - + workbench_materials_draw_scene_finish(data); } diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 1bae8f3a53b..8e61828f063 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -63,7 +63,7 @@ typedef struct WORKBENCH_PrivateData { typedef struct WORKBENCH_MaterialData { /* Solid color */ float color[3]; - + /* Linked shgroup for drawing */ DRWShadingGroup *shgrp; } WORKBENCH_MaterialData; diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 301a39d053f..e84a2378a48 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -2799,4 +2799,4 @@ Gwn_Batch *DRW_cache_cursor_get(void) SHC.drw_cursor = GWN_batch_create_ex(GWN_PRIM_LINE_STRIP, vbo, ibo, GWN_BATCH_OWNS_VBO | GWN_BATCH_OWNS_INDEX); } return SHC.drw_cursor; -}
\ No newline at end of file +} diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.c b/source/blender/draw/intern/draw_cache_impl_lattice.c index eed408de3cd..1cb55039b16 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.c +++ b/source/blender/draw/intern/draw_cache_impl_lattice.c @@ -538,7 +538,7 @@ static void lattice_batch_cache_create_overlay_batches(Lattice *lt) } cache->overlay_verts = GWN_batch_create_ex(GWN_PRIM_POINTS, vbo, NULL, GWN_BATCH_OWNS_VBO); - } + } lattice_render_data_free(rdata); } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index d42bb09684c..38094404db7 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -905,7 +905,7 @@ static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int dr if (drawtype_lighting == V3D_LIGHTING_FLAT) { use_drw_engine(&draw_engine_workbench_solid_flat); - } + } else if (drawtype_lighting == V3D_LIGHTING_STUDIO) { use_drw_engine(&draw_engine_workbench_solid_studio); diff --git a/source/blender/draw/modes/draw_mode_engines.h b/source/blender/draw/modes/draw_mode_engines.h index a1f769d244f..9522e3cddc6 100644 --- a/source/blender/draw/modes/draw_mode_engines.h +++ b/source/blender/draw/modes/draw_mode_engines.h @@ -42,4 +42,4 @@ extern DrawEngineType draw_engine_pose_type; extern DrawEngineType draw_engine_sculpt_type; extern DrawEngineType draw_engine_overlay_type; -#endif /* __DRAW_MODE_ENGINES_H__ */
\ No newline at end of file +#endif /* __DRAW_MODE_ENGINES_H__ */ diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 6ad1205a296..7538899debc 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -99,7 +99,7 @@ static void overlay_cache_init(void *vedata) stl->g_data->overlays = v3d->overlays; /* - Solid flat/studio lighting gives strange results when blending with the defaults. + Solid flat/studio lighting gives strange results when blending with the defaults. */ if (v3d->drawtype == OB_SOLID) { bm_face_orientation = DRW_STATE_BLEND; diff --git a/source/blender/draw/modes/shaders/object_grid_frag.glsl b/source/blender/draw/modes/shaders/object_grid_frag.glsl index eab4de72115..baf508fd854 100644 --- a/source/blender/draw/modes/shaders/object_grid_frag.glsl +++ b/source/blender/draw/modes/shaders/object_grid_frag.glsl @@ -204,4 +204,4 @@ void main() } FragColor.a *= fade; -}
\ No newline at end of file +} diff --git a/source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl b/source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl index 85a656df906..d9616076dbf 100644 --- a/source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl +++ b/source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl @@ -32,4 +32,4 @@ void main() gl_Position = ViewProjectionMatrix * vec4(pos * 0.02 * sphere_size + ws_cell_location, 1.0); finalId = uint(baseId + call_id); -}
\ No newline at end of file +} diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index a076521b41d..c5882560083 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -4,7 +4,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 @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** @@ -63,14 +63,14 @@ void ED_object_facemap_face_add(Object *ob, bFaceMap *fmap, int facenum) int fmap_nr; if (GS(((ID *)ob->data)->name) != ID_ME) return; - + /* get the face map number, exit if it can't be found */ fmap_nr = BLI_findindex(&ob->fmaps, fmap); if (fmap_nr != -1) { int *facemap; Mesh *me = ob->data; - + /* if there's is no facemap layer then create one */ if ((facemap = CustomData_get_layer(&me->pdata, CD_FACEMAP)) == NULL) facemap = CustomData_add_layer(&me->pdata, CD_FACEMAP, CD_DEFAULT, NULL, me->totpoly); @@ -85,18 +85,18 @@ void ED_object_facemap_face_remove(Object *ob, bFaceMap *fmap, int facenum) int fmap_nr; if (GS(((ID *)ob->data)->name) != ID_ME) return; - + /* get the face map number, exit if it can't be found */ fmap_nr = BLI_findindex(&ob->fmaps, fmap); if (fmap_nr != -1) { int *facemap; Mesh *me = ob->data; - + /* if there's is no facemap layer then create one */ if ((facemap = CustomData_get_layer(&me->pdata, CD_FACEMAP)) == NULL) return; - + facemap[facenum] = -1; } } @@ -105,19 +105,19 @@ static void object_fmap_swap_edit_mode(Object *ob, int num1, int num2) { 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; - + 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 (num1 != -1) { if (*map == num1) @@ -136,11 +136,11 @@ static void object_fmap_swap_object_mode(Object *ob, int num1, int num2) { 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 (num1 != -1) { @@ -190,7 +190,7 @@ static int face_map_add_exec(bContext *C, wmOperator *UNUSED(op)) DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - + return OPERATOR_FINISHED; } @@ -200,7 +200,7 @@ void OBJECT_OT_face_map_add(struct wmOperatorType *ot) ot->name = "Add Face Map"; ot->idname = "OBJECT_OT_face_map_add"; ot->description = "Add a new face map to the active object"; - + /* api callbacks */ ot->poll = face_map_supported_poll; ot->exec = face_map_add_exec; @@ -213,7 +213,7 @@ static int face_map_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1); - + if (fmap) { BKE_object_facemap_remove(ob, fmap); DEG_id_tag_update(&ob->id, OB_RECALC_DATA); @@ -229,7 +229,7 @@ void OBJECT_OT_face_map_remove(struct wmOperatorType *ot) ot->name = "Remove Face Map"; ot->idname = "OBJECT_OT_face_map_remove"; ot->description = "Remove a face map from the active object"; - + /* api callbacks */ ot->poll = face_map_supported_poll; ot->exec = face_map_remove_exec; @@ -242,7 +242,7 @@ static int face_map_assign_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1); - + if (fmap) { Mesh *me = ob->data; BMEditMesh *em = me->edit_btmesh; @@ -250,20 +250,20 @@ static int face_map_assign_exec(bContext *C, wmOperator *UNUSED(op)) BMIter iter; int *map; int cd_fmap_offset; - + if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP)) BM_data_layer_add(em->bm, &em->bm->pdata, CD_FACEMAP); - + cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP); - + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset); - + if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { *map = ob->actfmap - 1; } } - + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); @@ -277,7 +277,7 @@ void OBJECT_OT_face_map_assign(struct wmOperatorType *ot) ot->name = "Assign Face Map"; ot->idname = "OBJECT_OT_face_map_assign"; ot->description = "Assign faces to a face map"; - + /* api callbacks */ ot->poll = face_map_supported_edit_mode_poll; ot->exec = face_map_assign_exec; @@ -290,7 +290,7 @@ static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1); - + if (fmap) { Mesh *me = ob->data; BMEditMesh *em = me->edit_btmesh; @@ -299,20 +299,20 @@ static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op)) int *map; int cd_fmap_offset; int mapindex = ob->actfmap - 1; - + if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP)) return OPERATOR_CANCELLED; - + cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP); - + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset); - + if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && *map == mapindex) { *map = -1; } } - + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); @@ -326,7 +326,7 @@ void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot) ot->name = "Remove From Face Map"; ot->idname = "OBJECT_OT_face_map_remove_from"; ot->description = "Remove faces from a face map"; - + /* api callbacks */ ot->poll = face_map_supported_edit_mode_poll; ot->exec = face_map_remove_from_exec; @@ -344,15 +344,15 @@ static void fmap_select(Object *ob, bool select) int *map; int cd_fmap_offset; int mapindex = ob->actfmap - 1; - + if (!CustomData_has_layer(&em->bm->pdata, CD_FACEMAP)) BM_data_layer_add(em->bm, &em->bm->pdata, CD_FACEMAP); - + cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP); - + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { map = BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset); - + if (*map == mapindex) { BM_face_select_set(em->bm, efa, select); } @@ -363,10 +363,10 @@ static int face_map_select_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1); - + if (fmap) { fmap_select(ob, true); - + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); @@ -380,7 +380,7 @@ void OBJECT_OT_face_map_select(struct wmOperatorType *ot) ot->name = "Select Face Map Faces"; ot->idname = "OBJECT_OT_face_map_select"; ot->description = "Select faces belonging to a face map"; - + /* api callbacks */ ot->poll = face_map_supported_edit_mode_poll; ot->exec = face_map_select_exec; @@ -393,7 +393,7 @@ static int face_map_deselect_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); bFaceMap *fmap = BLI_findlink(&ob->fmaps, ob->actfmap - 1); - + if (fmap) { fmap_select(ob, false); @@ -410,7 +410,7 @@ void OBJECT_OT_face_map_deselect(struct wmOperatorType *ot) ot->name = "Deselect Face Map Faces"; ot->idname = "OBJECT_OT_face_map_deselect"; ot->description = "Deselect faces belonging to a face map"; - + /* api callbacks */ ot->poll = face_map_supported_edit_mode_poll; ot->exec = face_map_deselect_exec; @@ -434,7 +434,7 @@ static int face_map_move_exec(bContext *C, wmOperator *op) count = BLI_listbase_count(&ob->fmaps); pos1 = BLI_findindex(&ob->fmaps, fmap); - + if (dir == 1) { /*up*/ void *prev = fmap->prev; @@ -444,7 +444,7 @@ static int face_map_move_exec(bContext *C, wmOperator *op) else { pos2 = count - 1; } - + BLI_remlink(&ob->fmaps, fmap); BLI_insertlinkbefore(&ob->fmaps, prev, fmap); } @@ -457,16 +457,16 @@ static int face_map_move_exec(bContext *C, wmOperator *op) else { pos2 = 0; } - + BLI_remlink(&ob->fmaps, fmap); BLI_insertlinkafter(&ob->fmaps, next, fmap); } /* iterate through mesh and substitute the indices as necessary */ object_facemap_swap(ob, pos2, pos1); - + ob->actfmap = pos2 + 1; - + DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob); diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c index 0a6ec0e7aa0..fa39d89091c 100644 --- a/source/blender/editors/space_topbar/space_topbar.c +++ b/source/blender/editors/space_topbar/space_topbar.c @@ -93,14 +93,14 @@ static SpaceLink *topbar_new(const ScrArea *UNUSED(area), const Scene *UNUSED(sc /* not spacelink itself */ static void topbar_free(SpaceLink *UNUSED(sl)) { - + } /* spacetype; init callback */ static void topbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa)) { - + } static SpaceLink *topbar_duplicate(SpaceLink *sl) @@ -136,12 +136,12 @@ static void topbar_main_region_draw(const bContext *C, ARegion *region) static void topbar_operatortypes(void) { - + } static void topbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) { - + } /* add handlers, stuff you only do once or on area/region changes */ diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 1ba46453915..eecd185aedf 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -4,7 +4,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 @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** @@ -208,7 +208,7 @@ static void backdrawview3d( #endif if (v3d->drawtype > OB_WIRE) v3d->zbuf = true; - + /* dithering and AA break color coding, so disable */ glDisable(GL_DITHER); @@ -254,10 +254,10 @@ static void backdrawview3d( glClear(GL_COLOR_BUFFER_BIT); glDisable(GL_DEPTH_TEST); } - + if (rv3d->rflag & RV3D_CLIPPING) ED_view3d_clipping_set(rv3d); - + G.f |= G_BACKBUFSEL; if (obact && ((obact->base_flag & BASE_VISIBLED) != 0)) { @@ -369,7 +369,7 @@ ImBuf *ED_view3d_backbuf_read( } GPU_select_to_index_array(ibuf_clip->rect, size_clip[0] * size_clip[1]); - + if ((clip.xmin == xmin) && (clip.xmax == xmax) && (clip.ymin == ymin) && @@ -411,17 +411,17 @@ unsigned int ED_view3d_backbuf_sample_rect( unsigned index = 0; int rc = 0; - + dirvec[0][0] = 1; dirvec[0][1] = 0; dirvec[1][0] = 0; dirvec[1][1] = -size; dirvec[2][0] = -1; dirvec[2][1] = 0; dirvec[3][0] = 0; dirvec[3][1] = size; - + const unsigned *bufmin = buf->rect; const unsigned *tbuf = buf->rect; const unsigned *bufmax = buf->rect + size * size; tbuf += amount * size + amount; - + for (int nr = 1; nr <= size; nr++) { for (int a = 0; a < 2; a++) { for (int b = 0; b < nr; b++) { @@ -438,9 +438,9 @@ unsigned int ED_view3d_backbuf_sample_rect( index = (*tbuf - min) + 1; goto exit; } - + tbuf += (dirvec[rc][0] + dirvec[rc][1]); - + if (tbuf < bufmin || tbuf >= bufmax) { goto exit; } @@ -802,7 +802,7 @@ void view3d_update_depths_rect(ARegion *ar, ViewDepths *d, rcti *rect) MEM_freeN(d->depths); d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths Subset"); - + d->damaged = true; } @@ -818,7 +818,7 @@ void view3d_update_depths_rect(ARegion *ar, ViewDepths *d, rcti *rect) void ED_view3d_depth_update(ARegion *ar) { RegionView3D *rv3d = ar->regiondata; - + /* Create storage for, and, if necessary, copy depth buffer */ if (!rv3d->depths) rv3d->depths = MEM_callocN(sizeof(ViewDepths), "ViewDepths"); if (rv3d->depths) { @@ -834,11 +834,11 @@ void ED_view3d_depth_update(ARegion *ar) d->depths = MEM_mallocN(sizeof(float) * d->w * d->h, "View depths"); d->damaged = true; } - + if (d->damaged) { view3d_opengl_read_pixels(ar, 0, 0, d->w, d->h, GL_DEPTH_COMPONENT, GL_FLOAT, d->depths); glGetDoublev(GL_DEPTH_RANGE, d->depth_range); - + d->damaged = false; } } @@ -913,7 +913,7 @@ CustomDataMask ED_view3d_datamask(const Scene *UNUSED(scene), const View3D *v3d) CustomDataMask ED_view3d_screen_datamask(const Scene *scene, const bScreen *screen) { CustomDataMask mask = CD_MASK_BAREMESH; - + /* check if we need tfaces & mcols due to view mode */ for (const ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { if (sa->spacetype == SPACE_VIEW3D) { @@ -973,18 +973,18 @@ void ED_scene_draw_fps(Scene *scene, const rcti *rect) { ScreenFrameRateInfo *fpsi = scene->fps_info; char printable[16]; - + if (!fpsi || !fpsi->lredrawtime || !fpsi->redrawtime) return; - + printable[0] = '\0'; - + #if 0 /* this is too simple, better do an average */ fps = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime)) #else fpsi->redrawtimes_fps[fpsi->redrawtime_index] = (float)(1.0 / (fpsi->lredrawtime - fpsi->redrawtime)); - + float fps = 0.0f; int tot = 0; for (int i = 0; i < REDRAW_FRAME_AVERAGE; i++) { @@ -995,11 +995,11 @@ void ED_scene_draw_fps(Scene *scene, const rcti *rect) } if (tot) { fpsi->redrawtime_index = (fpsi->redrawtime_index + 1) % REDRAW_FRAME_AVERAGE; - + //fpsi->redrawtime_index++; //if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE) // fpsi->redrawtime = 0; - + fps = fps / tot; } #endif @@ -1043,7 +1043,7 @@ bool ED_view3d_calc_render_border(const Scene *scene, Depsgraph *depsgraph, View use_border = (scene->r.mode & R_BORDER) != 0; else use_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0; - + if (!use_border) return false; diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 760faeff7b1..b706bdbf189 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -4,7 +4,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 @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2016 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Mike Erwin * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 6206e973908..2a2692e6baf 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -4,7 +4,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 @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2016 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Mike Erwin * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c index 6d52dab5a1f..afd43600d9b 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.c +++ b/source/blender/gpu/intern/gpu_uniformbuffer.c @@ -101,7 +101,7 @@ GPUUniformBuffer *GPU_uniformbuffer_create(int size, const void *data, char err_ /* Generate Buffer object */ glGenBuffers(1, &ubo->bindcode); - + if (!ubo->bindcode) { if (err_out) BLI_snprintf(err_out, 256, "GPUUniformBuffer: UBO create failed"); diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl index 8dda575107a..1497f9eeeb1 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl @@ -7,4 +7,4 @@ out vec4 fragColor; void main() { fragColor = finalColor; fragColor.a *= smoothstep(1.0, 0.1, abs(colorGradient)); -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl index 4c295fcd72a..4a9f5f94321 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl @@ -104,4 +104,4 @@ void main(void) if (expand.y != 1.0 && !doArrow) { gl_Position.xy *= 0.0; } -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl index f660cae8d12..286a5373554 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl @@ -32,4 +32,4 @@ void main() if (butCo > 0.0) { fragColor.a = 1.0; } -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl index 7587b2fc18a..fc4d055a903 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl @@ -10,4 +10,4 @@ void main() fragColor = vec4(0.0); /* Manual curve fit of the falloff curve of previous drawing method. */ fragColor.a = alpha * (shadowFalloff * shadowFalloff * 0.722 + shadowFalloff * 0.277); -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl index 2f5353a7c86..f6be496ac4f 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl @@ -61,4 +61,4 @@ void main() v += rct.xw; gl_Position = ModelViewProjectionMatrix * vec4(v, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl b/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl index 10b5fad7972..e7632fcad15 100644 --- a/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl +++ b/source/blender/gpu/shaders/gpu_shader_edges_front_back_persp_geom.glsl @@ -45,7 +45,7 @@ void main() if (finalEdgeClass > 0.0f) { // front-facing edge if (drawFront) - emitLine(frontColor); + emitLine(frontColor); } else if (finalEdgeClass < 0.0f) { // back-facing edge diff --git a/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl index c2b25cc8011..97eb3afc177 100644 --- a/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_image_linear_frag.glsl @@ -27,4 +27,4 @@ void main() { fragColor = texture(image, texCoord_interp.st); linearrgb_to_srgb(fragColor, fragColor); -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl index 142df70e68a..ced5bb7f684 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl @@ -22,4 +22,4 @@ void main() gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pos * -len + sta, 1.0); gl_PointSize = size; finalColor = vec4(color, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl b/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl index 6f580ef3ff6..e26f419b8cd 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl @@ -42,7 +42,7 @@ void main() if (finalEdgeClass > 0.0f) { // front-facing edge if (drawFront) - emitLine(vec4(fCol[0], 0.75)); + emitLine(vec4(fCol[0], 0.75)); } else if (finalEdgeClass < 0.0f) { // back-facing edge diff --git a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c index c249e77c17a..cd912a4b4cb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c +++ b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c @@ -4,7 +4,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 diff --git a/source/blender/python/gawain/CMakeLists.txt b/source/blender/python/gawain/CMakeLists.txt index 6b6c902f48a..9eab323a0fe 100644 --- a/source/blender/python/gawain/CMakeLists.txt +++ b/source/blender/python/gawain/CMakeLists.txt @@ -18,7 +18,7 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC +set(INC . ../../blenkernel ../../blenlib diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 5e000489ace..98e29a6f496 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -4,7 +4,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 |