From 351f7788e1419f867deba2220625020bbd57ac79 Mon Sep 17 00:00:00 2001 From: tristan Date: Sun, 27 May 2018 21:03:58 +0200 Subject: [PATCH] UPBGE: Re-enable 8th UV and color layer in ConstructArray. Somehow the case in RAS_IDisplayArray::ConstructArray was ignoring the vertex formats with an 8th UV or color layer. Intent to fix issue #699. --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- source/gameengine/Rasterizer/RAS_VertexFormat.h | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 68c9db0e950a..507eacde9608 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 68c9db0e950affb3c375c6ee2756669b0da92c7e +Subproject commit 507eacde9608ce0190c6087fb338dd63f7a1649b diff --git a/release/scripts/addons b/release/scripts/addons index 29f2b2f34a82..ff8ef5cb121e 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 29f2b2f34a8255828cf1621edd5c725167338f9f +Subproject commit ff8ef5cb121e590ef1a5f3e5f57b9bf99c46559d diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 1cc12d9aeb05..2ff215a19426 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 1cc12d9aeb05cd91a09bad1ba7934472377d6d3d +Subproject commit 2ff215a194267434043433d83e4cf48eff58250c diff --git a/source/gameengine/Rasterizer/RAS_VertexFormat.h b/source/gameengine/Rasterizer/RAS_VertexFormat.h index dff7c1e25bba..e8bf650e74e5 100644 --- a/source/gameengine/Rasterizer/RAS_VertexFormat.h +++ b/source/gameengine/Rasterizer/RAS_VertexFormat.h @@ -55,7 +55,8 @@ using RAS_VertexFormatUvTuple = std::tuple< RAS_VertexFormatType<4, color>, RAS_VertexFormatType<5, color>, RAS_VertexFormatType<6, color>, - RAS_VertexFormatType<7, color> + RAS_VertexFormatType<7, color>, + RAS_VertexFormatType<8, color> >; using RAS_VertexFormatTuple = decltype(std::tuple_cat( @@ -65,7 +66,8 @@ using RAS_VertexFormatTuple = decltype(std::tuple_cat( RAS_VertexFormatUvTuple<4>(), RAS_VertexFormatUvTuple<5>(), RAS_VertexFormatUvTuple<6>(), - RAS_VertexFormatUvTuple<7>() + RAS_VertexFormatUvTuple<7>(), + RAS_VertexFormatUvTuple<8>() )); #endif // __RAS_VERTEX_FORMAT_H__