Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-26 18:38:18 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-27 14:22:01 +0300
commit1107af1abb0d4bf271e995a18f5d4bd790d51d02 (patch)
treea5cc6e1390176cdb62bf40870d4dd5a5b18ee617 /source/blender/usd
parent9cacadc8a637cc6c96380f73c4bfd1d6967351bd (diff)
Fix OBJECT_GUARDED_FREE compiler error when type is in namespace
Diffstat (limited to 'source/blender/usd')
-rw-r--r--source/blender/usd/intern/usd_capi.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/usd/intern/usd_capi.cc
index 502f8677174..f8391700324 100644
--- a/source/blender/usd/intern/usd_capi.cc
+++ b/source/blender/usd/intern/usd_capi.cc
@@ -23,6 +23,8 @@
#include <pxr/usd/usd/stage.h>
#include <pxr/usd/usdGeom/tokens.h>
+#include "MEM_guardedalloc.h"
+
extern "C" {
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
@@ -39,8 +41,6 @@ extern "C" {
#include "BLI_path_util.h"
#include "BLI_string.h"
-#include "MEM_guardedalloc.h"
-
#include "WM_api.h"
#include "WM_types.h"
}