archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: naming for library link enum

Browse Source 
Use 'e' prefix, update comments.
This commit is contained in:
Campbell Barton
2020-09-08 16:41:55 +10:00
parent 748deced1c
commit d20b08281e
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/BLO_readfile.h
View File

@@ -142,13 +142,15 @@ bool BLO_library_path_explode(const char *path, char *r_dir, char **r_group, cha
/** \name BLO Blend File Linking API
* \{ */
/* Options controlling behavior of append/link code.
* Note: merged with 'user-level' options from operators etc. in 16 lower bits
* (see eFileSel_Params_Flag in DNA_space_types.h). */
typedef enum BLO_LibLinkFlags {
/* Generate a placeholder (empty ID) if not found in current lib file. */
/**
* Options controlling behavior of append/link code.
* \note merged with 'user-level' options from operators etc. in 16 lower bits
* (see #eFileSel_Params_Flag in DNA_space_types.h).
*/
typedef enum eBLOLibLinkFlags {
/** Generate a placeholder (empty ID) if not found in current lib file. */
BLO_LIBLINK_USE_PLACEHOLDERS = 1 << 16,
/* Force loaded ID to be tagged as LIB_TAG_INDIRECT (used in reload context only). */
/** Force loaded ID to be tagged as #LIB_TAG_INDIRECT (used in reload context only). */
BLO_LIBLINK_FORCE_INDIRECT = 1 << 17,
/**
* When set, tag ID types that pass the internal check #library_link_idcode_needs_tag_check
@@ -158,7 +160,7 @@ typedef enum BLO_LibLinkFlags {
* don't need to remember to set this flag.
*/
BLO_LIBLINK_NEEDS_ID_TAG_DOIT = 1 << 18,
} BLO_LinkFlags;
} eBLOLibLinkFlags;
/**
* Struct for passing arguments to

6
source/blender/makesdna/DNA_space_types.h
View File

@@ -801,8 +801,10 @@ typedef enum eFileSel_Action {
} eFileSel_Action;
/* sfile->params->flag */
/* Note: short flag, also used as 16 lower bits of flags in link/append code
* (WM and BLO code area, see BLO_LibLinkFlags in BLO_readfile.h). */
/**
* \note short flag, also used as 16 lower bits of flags in link/append code
* (WM and BLO code area, see #eBLOLibLinkFlags in BLO_readfile.h).
*/
typedef enum eFileSel_Params_Flag {
FILE_PARAMS_FLAG_UNUSED_1 = (1 << 0), /* cleared */
FILE_RELPATH = (1 << 1),

7
source/blender/windowmanager/intern/wm_files_link.c
View File

@@ -159,8 +159,9 @@ typedef struct WMLinkAppendData {
LinkNodePair items;
int num_libraries;
int num_items;
/** Combines #eFileSel_Params_Flag from DNA_space_types.h and
* BLO_LibLinkFlags from BLO_readfile.h */
/**
* Combines #eFileSel_Params_Flag from DNA_space_types.h & #eBLOLibLinkFlags from BLO_readfile.h
*/
int flag;
/* Internal 'private' data */
@@ -402,7 +403,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
scene = NULL;
}
/* We need to add nothing from BLO_LibLinkFlags to flag here. */
/* We need to add nothing from #eBLOLibLinkFlags to flag here. */
/* from here down, no error returns */