LibOverride: Make `ID_IS_OVERRIDABLE_LIBRARY` macro more correct.
This commit is contained in:
parent
ef17e7e51b
commit
d998258fa6
|
@ -478,7 +478,8 @@ typedef enum ID_Type {
|
|||
/* Note that this is a fairly high-level check, should be used at user interaction level, not in
|
||||
* BKE_library_override typically (especially due to the check on LIB_TAG_EXTERN). */
|
||||
#define ID_IS_OVERRIDABLE_LIBRARY(_id) \
|
||||
(ID_IS_LINKED(_id) && !ID_MISSING(_id) && (((const ID *)(_id))->tag & LIB_TAG_EXTERN) != 0)
|
||||
(ID_IS_LINKED(_id) && !ID_MISSING(_id) && (((const ID *)(_id))->tag & LIB_TAG_EXTERN) != 0 && \
|
||||
(BKE_idtype_get_info_from_id((const ID *)(_id))->flags & IDTYPE_FLAGS_NO_LIBLINKING) == 0)
|
||||
|
||||
#define ID_IS_OVERRIDE_LIBRARY_REAL(_id) \
|
||||
(((const ID *)(_id))->override_library != NULL && \
|
||||
|
|
|
@ -96,6 +96,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
|
|||
# include "BKE_font.h"
|
||||
# include "BKE_global.h" /* XXX, remove me */
|
||||
# include "BKE_idprop.h"
|
||||
# include "BKE_idtype.h"
|
||||
# include "BKE_lib_override.h"
|
||||
# include "BKE_lib_query.h"
|
||||
# include "BKE_lib_remap.h"
|
||||
|
|
Loading…
Reference in New Issue