Merge remote-tracking branch 'origin/master' into openvdbopenvdb

1 files changed, 23 insertions, 0 deletions

diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index a4f5c425282..387045878f3 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -51,6 +51,8 @@ extern "C" {
 struct EvaluationContext;
 struct Library;
 struct MainLock;
+struct GHash;
+struct BLI_mempool;
 
 /* Blender thumbnail, as written on file (width, height, and data as char RGBA). */
 /* We pack pixel data after that struct. */
@@ -59,6 +61,22 @@ typedef struct BlendThumbnail {
 	char rect[0];
 } BlendThumbnail;
 
+/* Structs caching relations between data-blocks in a given Main. */
+typedef struct MainIDRelationsEntry {
+	struct MainIDRelationsEntry *next;
+	/* WARNING! for user_to_used, that pointer is really an ID** one, but for used_to_user, it’s only an ID* one! */
+	struct ID **id_pointer;
+	int usage_flag;  /* Using IDWALK_ enums, in BKE_library_query.h */
+} MainIDRelationsEntry;
+
+typedef struct MainIDRelations {
+	struct GHash *id_user_to_used;
+	struct GHash *id_used_to_user;
+
+	/* Private... */
+	struct BLI_mempool *entry_pool;
+} MainIDRelations;
+
 typedef struct Main {
 	struct Main *next, *prev;
 	char name[1024]; /* 1024 = FILE_MAX */
@@ -111,6 +129,11 @@ typedef struct Main {
 	/* Evaluation context used by viewport */
 	struct EvaluationContext *eval_ctx;
 
+	/* Must be generated, used and freed by same code - never assume this is valid data unless you know
+	 * when, who and how it was created.
+	 * Used by code doing a lot of remapping etc. at once to speed things up. */
+	struct MainIDRelations *relations;
+
 	struct MainLock *lock;
 } Main;