[Bf-blender-cvs] [f8a62817b69] sybren-usd: More feedback from Sergey

[Sybren A. Stüvel]

Commit: f8a62817b69227c78f710329157454ad3e486b77
Author: Sybren A. Stüvel
Date:   Fri Nov 15 14:26:27 2019 +0100
Branches: sybren-usd
https://developer.blender.org/rBf8a62817b69227c78f710329157454ad3e486b77

More feedback from Sergey

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

M	tests/gtests/blenloader/CMakeLists.txt
M	tests/gtests/blenloader/blendfile_loading_base_test.cc
M	tests/gtests/blenloader/blendfile_loading_base_test.h
M	tests/gtests/testing/CMakeLists.txt

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

diff --git a/tests/gtests/blenloader/CMakeLists.txt b/tests/gtests/blenloader/CMakeLists.txt
index 83e11b82f6b..9f5f5c2782e 100644
--- a/tests/gtests/blenloader/CMakeLists.txt
+++ b/tests/gtests/blenloader/CMakeLists.txt
@@ -29,7 +29,7 @@ set(INC
     ../../../source/blender/makesrna
     ../../../source/blender/windowmanager
     ../../../intern/guardedalloc
-      ${GLOG_INCLUDE_DIRS}
+    ${GLOG_INCLUDE_DIRS}
     ${GFLAGS_INCLUDE_DIRS}
     ../../../extern/gtest/include
 )
diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.cc b/tests/gtests/blenloader/blendfile_loading_base_test.cc
index 7c447e4fd77..b6a0ec82ee6 100644
--- a/tests/gtests/blenloader/blendfile_loading_base_test.cc
+++ b/tests/gtests/blenloader/blendfile_loading_base_test.cc
@@ -49,11 +49,6 @@ extern "C" {
 
 DEFINE_string(test_assets_dir, "", "lib/tests directory from SVN containing the test assets.");
 
-BlendfileLoadingBaseTest::BlendfileLoadingBaseTest()
-    : testing::Test(), bfile(nullptr), depsgraph(nullptr)
-{
-}
-
 BlendfileLoadingBaseTest::~BlendfileLoadingBaseTest()
 {
 }
diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.h b/tests/gtests/blenloader/blendfile_loading_base_test.h
index 4cbc0c4fef4..57aa8fd9e92 100644
--- a/tests/gtests/blenloader/blendfile_loading_base_test.h
+++ b/tests/gtests/blenloader/blendfile_loading_base_test.h
@@ -26,11 +26,10 @@ struct Depsgraph;
 
 class BlendfileLoadingBaseTest : public testing::Test {
  protected:
-  struct BlendFileData *bfile;
-  struct Depsgraph *depsgraph;
+  struct BlendFileData *bfile = nullptr;
+  struct Depsgraph *depsgraph = nullptr;
 
  public:
-  BlendfileLoadingBaseTest();
   virtual ~BlendfileLoadingBaseTest();
 
   /* Sets up Blender just enough to not crash on loading
diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt
index f16c6223f19..6bbbfdd5d89 100644
--- a/tests/gtests/testing/CMakeLists.txt
+++ b/tests/gtests/testing/CMakeLists.txt
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# The Original Code is Copyright (C) 2019 by Blender Foundation.
+# The Original Code is Copyright (C) 2014, by Blender Foundation
+# All rights reserved.
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC