[Bf-blender-cvs] [e392dcdc24d] asset-browser: Fix compiling and warning on MSVC

[Julian Eisel]

Commit: e392dcdc24d8d09b38fc2c1c9965ad1e07eb793f
Author: Julian Eisel
Date:   Fri Aug 28 20:19:45 2020 +0200
Branches: asset-browser
https://developer.blender.org/rBe392dcdc24d8d09b38fc2c1c9965ad1e07eb793f

Fix compiling and warning on MSVC

Also use #pragma once instead of include guards, just like master now.

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

M	source/blender/makesdna/DNA_asset_defaults.h
M	source/blender/makesdna/DNA_space_types.h

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

diff --git a/source/blender/makesdna/DNA_asset_defaults.h b/source/blender/makesdna/DNA_asset_defaults.h
index b0ebf75e5f1..de20bcf7b68 100644
--- a/source/blender/makesdna/DNA_asset_defaults.h
+++ b/source/blender/makesdna/DNA_asset_defaults.h
@@ -18,8 +18,7 @@
  * \ingroup DNA
  */
 
-#ifndef __DNA_ASSET_DEFAULTS_H__
-#define __DNA_ASSET_DEFAULTS_H__
+#pragma once
 
 /* Struct members on own line. */
 /* clang-format off */
@@ -30,10 +29,9 @@
 
 #define _DNA_DEFAULT_AssetData \
   { \
+    0 \
   }
 
 /** \} */
 
 /* clang-format on */
-
-#endif /* __DNA_ASSET_DEFAULTS_H__ */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 669ba76b9fa..bca30214ebf 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -877,10 +877,10 @@ typedef enum eFileSel_File_Types {
   FILE_TYPE_USD = (1 << 18),
   FILE_TYPE_VOLUME = (1 << 19),
 
+  FILE_TYPE_ASSET = (1 << 29),
   /** An FS directory (i.e. S_ISDIR on its path is true). */
   FILE_TYPE_DIR = (1 << 30),
   FILE_TYPE_BLENDERLIB = (1ul << 31),
-  FILE_TYPE_ASSET = (1ul << 32),
 } eFileSel_File_Types;
 
 /* Selection Flags in filesel: struct direntry, unsigned char selflag */