Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite

3 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
index 90196988d94..668b59ac191 100644
--- a/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
@@ -55,7 +55,7 @@ static float normals[][3] = {
     {0.000000, 0.000000, 1.000000},
 };
 
-static unsigned short indices[] = {
+static ushort indices[] = {
     1,  3,  2,  3,  5,  4,  5,  7,  6,  7,  9,  8,  9,  11, 10, 11, 13, 12, 5,  18, 19, 15, 1,
     0,  13, 15, 14, 6,  10, 14, 11, 21, 22, 7,  19, 20, 13, 22, 23, 3,  17, 18, 9,  20, 21, 15,
     23, 16, 1,  16, 17, 23, 22, 24, 21, 20, 24, 19, 18, 24, 17, 16, 24, 16, 23, 24, 22, 21, 24,
diff --git a/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
index ea1a3147148..51618e353f4 100644
--- a/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
@@ -45,7 +45,7 @@ static const float normals[][3] = {
     {-0.577349, 0.577349, 0.577349},
 };
 
-static const unsigned short indices[] = {
+static const ushort indices[] = {
     1, 2, 3, 7, 6, 5, 4, 5, 1, 5, 6, 2, 2, 6, 7, 0, 3, 7,
     0, 1, 3, 4, 7, 5, 0, 4, 1, 1, 5, 2, 3, 2, 7, 4, 0, 7,
 };
diff --git a/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
index 273f957e9b6..7e37c233c2a 100644
--- a/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
@@ -221,7 +221,7 @@ static const float normals[][3] = {
     {-0.466689, 0.092807, -0.879513},  {0.512650, -0.101962, -0.852504},
 };
 
-static const unsigned short indices[] = {
+static const ushort indices[] = {
     6,   7,   1,   7,   8,   2,   8,   9,   3,   9,   10,  4,   10,  11,  5,   5,   11,  6,   12,
     13,  7,   13,  14,  8,   14,  15,  9,   15,  16,  10,  16,  17,  11,  11,  17,  12,  18,  19,
     13,  13,  19,  20,  20,  21,  15,  15,  21,  22,  22,  23,  17,  17,  23,  18,  24,  25,  19,