[Bf-blender-cvs] [b5cb4021fa1] asset-engine: Merge 'master' into 'asset-engine'

Bastien Montagne noreply at git.blender.org
Wed Apr 17 12:42:03 CEST 2019


Commit: b5cb4021fa10ac14b331f195f613a88d87bf6a72
Author: Bastien Montagne
Date:   Wed Apr 17 12:30:40 2019 +0200
Branches: asset-engine
https://developer.blender.org/rBb5cb4021fa10ac14b331f195f613a88d87bf6a72

Merge 'master' into 'asset-engine'

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



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

diff --cc source/blender/blenkernel/BKE_global.h
index 6daec65be23,2c19c1e2006..df6875b36f2
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@@ -132,59 -128,56 +132,56 @@@ enum 
  
  /** #Global.debug */
  enum {
 -  G_DEBUG = (1 << 0), /* general debug flag, print more info in unexpected cases */
 -  G_DEBUG_FFMPEG = (1 << 1),
 -  G_DEBUG_PYTHON = (1 << 2),                /* extra python info */
 -  G_DEBUG_EVENTS = (1 << 3),                /* input/window/screen events */
 -  G_DEBUG_HANDLERS = (1 << 4),              /* events handling */
 -  G_DEBUG_WM = (1 << 5),                    /* operator, undo */
 -  G_DEBUG_JOBS = (1 << 6),                  /* jobs time profiling */
 -  G_DEBUG_FREESTYLE = (1 << 7),             /* freestyle messages */
 -  G_DEBUG_DEPSGRAPH_BUILD = (1 << 8),       /* depsgraph construction messages */
 -  G_DEBUG_DEPSGRAPH_EVAL = (1 << 9),        /* depsgraph evaluation messages */
 -  G_DEBUG_DEPSGRAPH_TAG = (1 << 10),        /* depsgraph tagging messages */
 -  G_DEBUG_DEPSGRAPH_TIME = (1 << 11),       /* depsgraph timing statistics and messages */
 -  G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 12), /* single threaded depsgraph */
 -  G_DEBUG_DEPSGRAPH_PRETTY = (1 << 13),     /* use pretty colors in depsgraph messages */
 +	G_DEBUG =           (1 << 0),  /* general debug flag, print more info in unexpected cases */
 +	G_DEBUG_FFMPEG =    (1 << 1),
 +	G_DEBUG_PYTHON =    (1 << 2),  /* extra python info */
 +	G_DEBUG_EVENTS =    (1 << 3),  /* input/window/screen events */
 +	G_DEBUG_HANDLERS =  (1 << 4),  /* events handling */
 +	G_DEBUG_WM =        (1 << 5),  /* operator, undo */
 +	G_DEBUG_JOBS =      (1 << 6),  /* jobs time profiling */
 +	G_DEBUG_FREESTYLE = (1 << 7),  /* freestyle messages */
 +	G_DEBUG_DEPSGRAPH_BUILD      = (1 << 8),   /* depsgraph construction messages */
 +	G_DEBUG_DEPSGRAPH_EVAL       = (1 << 9),   /* depsgraph evaluation messages */
 +	G_DEBUG_DEPSGRAPH_TAG        = (1 << 10),  /* depsgraph tagging messages */
 +	G_DEBUG_DEPSGRAPH_TIME       = (1 << 11),  /* depsgraph timing statistics and messages */
 +	G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 12),  /* single threaded depsgraph */
 +	G_DEBUG_DEPSGRAPH_PRETTY     = (1 << 13),  /* use pretty colors in depsgraph messages */
- 	G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD |
- 	                     G_DEBUG_DEPSGRAPH_EVAL |
- 	                     G_DEBUG_DEPSGRAPH_TAG |
+   G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD | G_DEBUG_DEPSGRAPH_EVAL | G_DEBUG_DEPSGRAPH_TAG |
 -                       G_DEBUG_DEPSGRAPH_TIME),
 -  G_DEBUG_SIMDATA = (1 << 14),               /* sim debug data display */
 -  G_DEBUG_GPU_MEM = (1 << 15),               /* gpu memory in status bar */
 -  G_DEBUG_GPU = (1 << 16),                   /* gpu debug */
 -  G_DEBUG_IO = (1 << 17),                    /* IO Debugging (for Collada, ...)*/
 -  G_DEBUG_GPU_SHADERS = (1 << 18),           /* GLSL shaders */
 -  G_DEBUG_GPU_FORCE_WORKAROUNDS = (1 << 19), /* force gpu workarounds bypassing detections. */
 +	                     G_DEBUG_DEPSGRAPH_TIME),
 +	G_DEBUG_SIMDATA =   (1 << 14),  /* sim debug data display */
 +	G_DEBUG_GPU_MEM =   (1 << 15),  /* gpu memory in status bar */
 +	G_DEBUG_GPU =       (1 << 16),  /* gpu debug */
 +	G_DEBUG_IO =        (1 << 17),  /* IO Debugging (for Collada, ...)*/
 +	G_DEBUG_GPU_SHADERS = (1 << 18),  /* GLSL shaders */
 +	G_DEBUG_GPU_FORCE_WORKAROUNDS = (1 << 19),  /* force gpu workarounds bypassing detections. */
  };
  
  #define G_DEBUG_ALL \
 -  (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \
 -   G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH | G_DEBUG_GPU_MEM | G_DEBUG_IO | G_DEBUG_GPU_SHADERS)
 +	(G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \
 +	 G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH | G_DEBUG_GPU_MEM | G_DEBUG_IO | G_DEBUG_GPU_SHADERS)
  
- 
  /** #Global.fileflags */
  enum {
 -  G_FILE_AUTOPACK = (1 << 0),
 -  G_FILE_COMPRESS = (1 << 1),
 -
 -  G_FILE_USERPREFS = (1 << 9),
 -  G_FILE_NO_UI = (1 << 10),
 -
 -  /* Bits 11 to 22 (inclusive) are deprecated & need to be cleared */
 -
 -  /** On read, use #FileGlobal.filename instead of the real location on-disk,
 -   * needed for recovering temp files so relative paths resolve */
 -  G_FILE_RECOVER = (1 << 23),
 -  /** On write, remap relative file paths to the new file location. */
 -  G_FILE_RELATIVE_REMAP = (1 << 24),
 -  /** On write, make backup `.blend1`, `.blend2` ... files, when the users preference is enabled */
 -  G_FILE_HISTORY = (1 << 25),
 -  /** BMesh option to save as older mesh format */
 -  /* #define G_FILE_MESH_COMPAT       (1 << 26) */
 -  /** On write, restore paths after editing them (G_FILE_RELATIVE_REMAP) */
 -  G_FILE_SAVE_COPY = (1 << 27),
 -  /* #define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) */ /* deprecated */
 +	G_FILE_AUTOPACK          = (1 << 0),
 +	G_FILE_COMPRESS          = (1 << 1),
 +
 +	G_FILE_USERPREFS         = (1 << 9),
 +	G_FILE_NO_UI             = (1 << 10),
 +
 +	/* Bits 11 to 22 (inclusive) are deprecated & need to be cleared */
 +
 +	/** On read, use #FileGlobal.filename instead of the real location on-disk,
 +	 * needed for recovering temp files so relative paths resolve */
 +	G_FILE_RECOVER           = (1 << 23),
 +	/** On write, remap relative file paths to the new file location. */
 +	G_FILE_RELATIVE_REMAP    = (1 << 24),
 +	/** On write, make backup `.blend1`, `.blend2` ... files, when the users preference is enabled */
 +	G_FILE_HISTORY           = (1 << 25),
 +	/** BMesh option to save as older mesh format */
 +/* #define G_FILE_MESH_COMPAT       (1 << 26) */
 +	/** On write, restore paths after editing them (G_FILE_RELATIVE_REMAP) */
 +	G_FILE_SAVE_COPY         = (1 << 27),
 +/* #define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) */ /* deprecated */
  };
  
  /** Don't overwrite these flags when reading a file. */
diff --cc source/blender/blenkernel/BKE_library.h
index aef226c74ff,82ae832c73e..764004cea3f
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@@ -62,8 -60,9 +62,9 @@@ struct wmWindowManager
  
  size_t BKE_libblock_get_alloc_info(short type, const char **name);
  void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
- void *BKE_libblock_alloc(struct Main *bmain, short type, const char *name, const int flag) ATTR_WARN_UNUSED_RESULT;
+ void *BKE_libblock_alloc(struct Main *bmain, short type, const char *name, const int flag)
+     ATTR_WARN_UNUSED_RESULT;
 -void BKE_libblock_init_empty(struct ID *id) ATTR_NONNULL(1);
 +void  BKE_libblock_init_empty(struct ID *id) ATTR_NONNULL(1);
  
  void *BKE_id_new(struct Main *bmain, const short type, const char *name);
  void *BKE_id_new_nomain(const short type, const char *name);
@@@ -73,80 -71,84 +73,84 @@@
   * New ID creation/copying options.
   */
  enum {
 -  /* *** Generic options (should be handled by all ID types copying, ID creation, etc.). *** */
 -  /* Create datablock outside of any main database - similar to 'localize' functions of materials etc. */
 -  LIB_ID_CREATE_NO_MAIN = 1 << 0,
 -  /* Do not affect user refcount of datablocks used by new one (which also gets zero usercount then).
 -   * Implies LIB_ID_CREATE_NO_MAIN. */
 -  LIB_ID_CREATE_NO_USER_REFCOUNT = 1 << 1,
 -  /* Assume given 'newid' already points to allocated memory for whole datablock (ID + data) - USE WITH CAUTION!
 -   * Implies LIB_ID_CREATE_NO_MAIN. */
 -  LIB_ID_CREATE_NO_ALLOCATE = 1 << 2,
 -
 -  /* Do not tag new ID for update in depsgraph. */
 -  LIB_ID_CREATE_NO_DEG_TAG = 1 << 8,
 -
 -  /* *** Specific options to some ID types or usages. *** */
 -  /* *** May be ignored by unrelated ID copying functions. *** */
 -  /* Object only, needed by make_local code. */
 -  LIB_ID_COPY_NO_PROXY_CLEAR = 1 << 16,
 -  /* Do not copy preview data, when supported. */
 -  LIB_ID_COPY_NO_PREVIEW = 1 << 17,
 -  /* Copy runtime data caches. */
 -  LIB_ID_COPY_CACHES = 1 << 18,
 -  /* Don't copy id->adt, used by ID datablock localization routines. */
 -  LIB_ID_COPY_NO_ANIMDATA = 1 << 19,
 -  /* Mesh: Reference CD data layers instead of doing real copy - USE WITH CAUTION! */
 -  LIB_ID_COPY_CD_REFERENCE = 1 << 20,
 -
 -  /* *** XXX Hackish/not-so-nice specific behaviors needed for some corner cases. *** */
 -  /* *** Ideally we should not have those, but we need them for now... *** */
 -  /* EXCEPTION! Deep-copy actions used by animdata of copied ID. */
 -  LIB_ID_COPY_ACTIONS = 1 << 24,
 -  /* Keep the library pointer when copying datablock outside of bmain. */
 -  LIB_ID_COPY_KEEP_LIB = 1 << 25,
 -  /* EXCEPTION! Deep-copy shapekeys used by copied obdata ID. */
 -  LIB_ID_COPY_SHAPEKEY = 1 << 26,
 -
 -  /* *** Helper 'defines' gathering most common flag sets. *** */
 -  /* Shapekeys are not real ID's, more like local data to geometry IDs... */
 -  LIB_ID_COPY_DEFAULT = LIB_ID_COPY_SHAPEKEY,
 -  /* Generate a local copy, outside of bmain, to work on (used by COW e.g.). */
 +	/* *** Generic options (should be handled by all ID types copying, ID creation, etc.). *** */
 +	/* Create datablock outside of any main database - similar to 'localize' functions of materials etc. */
 +	LIB_ID_CREATE_NO_MAIN            = 1 << 0,
 +	/* Do not affect user refcount of datablocks used by new one (which also gets zero usercount then).
 +	 * Implies LIB_ID_CREATE_NO_MAIN. */
 +	LIB_ID_CREATE_NO_USER_REFCOUNT   = 1 << 1,
 +	/* Assume given 'newid' already points to allocated memory for whole datablock (ID + data) - USE WITH CAUTION!
 +	 * Implies LIB_ID_CREATE_NO_MAIN. */
 +	LIB_ID_CREATE_NO_ALLOCATE        = 1 << 2,
 +
 +	/* Do not tag new ID for update in depsgraph. */
 +	LIB_ID_CREATE_NO_DEG_TAG         = 1 << 8,
 +
 +	/* *** Specific options to some ID types or usages. *** */
 +	/* *** May be ignored by unrelated ID copying functions. *** */
 +	/* Object only, needed by make_local code. */
 +	LIB_ID_COPY_NO_PROXY_CLEAR     = 1 << 16,
 +	/* Do not copy preview data, when supported. */
 +	LIB_ID_COPY_NO_PREVIEW         = 1 << 17,
 +	/* Copy runtime data caches. */
 +	LIB_ID_COPY_CACHES             = 1 << 18,
 +	/* Don't copy id->adt, used by ID datablock localization rou

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list