[Bf-blender-cvs] [44a6138c2e6] temp-sybren-usd-patch: Replaced `#include "../usd.h"` with `#include "usd.h"`

Sybren A. Stüvel noreply at git.blender.org
Fri Nov 22 14:07:29 CET 2019


Commit: 44a6138c2e612dc9c29b20d68acf580d218798d6
Author: Sybren A. Stüvel
Date:   Fri Nov 22 14:06:50 2019 +0100
Branches: temp-sybren-usd-patch
https://developer.blender.org/rB44a6138c2e612dc9c29b20d68acf580d218798d6

Replaced `#include "../usd.h"` with `#include "usd.h"`

===================================================================

M	source/blender/usd/intern/usd_capi.cc
M	source/blender/usd/intern/usd_exporter_context.h
M	source/blender/usd/intern/usd_hierarchy_iterator.cc
M	source/blender/usd/intern/usd_hierarchy_iterator.h

===================================================================

diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/usd/intern/usd_capi.cc
index 13d41711625..221f44be2a6 100644
--- a/source/blender/usd/intern/usd_capi.cc
+++ b/source/blender/usd/intern/usd_capi.cc
@@ -17,7 +17,7 @@
  * All rights reserved.
  */
 
-#include "../usd.h"
+#include "usd.h"
 #include "usd_hierarchy_iterator.h"
 
 #include <pxr/usd/usd/stage.h>
diff --git a/source/blender/usd/intern/usd_exporter_context.h b/source/blender/usd/intern/usd_exporter_context.h
index ce08688668f..876aa13fd6b 100644
--- a/source/blender/usd/intern/usd_exporter_context.h
+++ b/source/blender/usd/intern/usd_exporter_context.h
@@ -19,7 +19,7 @@
 #ifndef __USD__USD_EXPORTER_CONTEXT_H__
 #define __USD__USD_EXPORTER_CONTEXT_H__
 
-#include "../usd.h"
+#include "usd.h"
 
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/usd/common.h>
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.cc b/source/blender/usd/intern/usd_hierarchy_iterator.cc
index 5f65c848a6a..0c0a4cc90f0 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/usd_hierarchy_iterator.cc
@@ -16,7 +16,7 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#include "../usd.h"
+#include "usd.h"
 
 #include "usd_hierarchy_iterator.h"
 #include "usd_writer_abstract.h"
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.h b/source/blender/usd/intern/usd_hierarchy_iterator.h
index cb44984164e..83416181ebf 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/usd/intern/usd_hierarchy_iterator.h
@@ -21,7 +21,7 @@
 
 #include "abstract_hierarchy_iterator.h"
 #include "usd_exporter_context.h"
-#include "../usd.h"
+#include "usd.h"
 
 #include <string>



More information about the Bf-blender-cvs mailing list