diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-08 20:33:22 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-08 20:33:22 +0300 |
commit | 282de867d48fea9cf930e68ef9553ed5d31cc5fd (patch) | |
tree | ee8499e5b0c2d0aa2dc1957667814bfee12eb03f /source/blender/blenkernel/BKE_library_query.h | |
parent | 77680abaf94b34ac8133fa0b0838e257ea418a20 (diff) |
Initial fix for proxy issues regarding new libquery/libremap ID handling code.
libquery now passes an extra flag info to the callback, in case that specific
ID usage is considered as indirect.
In most cases, it's just set from ID_IS_LINKED_DATABLOCK() result on datablock owner,
but in proxy object case we also consider ob->data, materials and pose usages as indirect.
Does not fixes all issues yet, but should already make behavior with proxy object saner.
Diffstat (limited to 'source/blender/blenkernel/BKE_library_query.h')
-rw-r--r-- | source/blender/blenkernel/BKE_library_query.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_library_query.h index f7cdf1f50fc..c5f575c8c0f 100644 --- a/source/blender/blenkernel/BKE_library_query.h +++ b/source/blender/blenkernel/BKE_library_query.h @@ -41,6 +41,12 @@ enum { IDWALK_NEVER_SELF = (1 << 1), /** + * Indicates whether this is direct (i.e. by local data) or indirect (i.e. by linked data) usage. + * \note Object proxies are half-local, half-linked... + */ + IDWALK_INDIRECT_USAGE = (1 << 2), + + /** * Adjusts #ID.us reference-count. * \note keep in sync with 'newlibadr_us' use in readfile.c */ |