summaryrefslogtreecommitdiff
path: root/indra/newview/gltf
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-11-11 01:55:26 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-11-11 01:55:26 +0200
commit32df877cd73b5b6a3672d0159c982077a4b67a9d (patch)
tree3db2802f0ab39f2d7b1264e2ac1d3599f1a3bd5a /indra/newview/gltf
parenteccc9057d9d9799d3d5056bdfe255bd9e5e2be6a (diff)
parente028ae4f023420bedd4e4106f4749e700a14c3cc (diff)
Merge branch 'develop' into marchcat/c-develop
# Conflicts: # indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/newview/gltf')
-rw-r--r--indra/newview/gltf/common.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/gltf/common.h b/indra/newview/gltf/common.h
index 742daff715..8cf3f1dff7 100644
--- a/indra/newview/gltf/common.h
+++ b/indra/newview/gltf/common.h
@@ -26,8 +26,6 @@
* $/LicenseInfo$
*/
-#define GLM_ENABLE_EXPERIMENTAL 1
-
#include "glm/vec2.hpp"
#include "glm/vec3.hpp"
#include "glm/vec4.hpp"