Page MenuHome
Differential D7310 Diff 30574 source/blender/makesdna/DNA_space_types.h

Changeset View

Standalone View

View Options

source/blender/makesdna/DNA_space_types.h

Show First 20 Lines • Show All 303 Lines • ▼ Show 20 Linestypedef enum eSpaceOutliner_Filter {
SO_FILTER_UNUSED_5 = (1 << 5), /* cleared */ SO_FILTER_UNUSED_5 = (1 << 5), /* cleared */
SO_FILTER_NO_OB_MESH = (1 << 6), SO_FILTER_NO_OB_MESH = (1 << 6),
SO_FILTER_NO_OB_ARMATURE = (1 << 7), SO_FILTER_NO_OB_ARMATURE = (1 << 7),
SO_FILTER_NO_OB_EMPTY = (1 << 8), SO_FILTER_NO_OB_EMPTY = (1 << 8),
SO_FILTER_NO_OB_LAMP = (1 << 9), SO_FILTER_NO_OB_LAMP = (1 << 9),
SO_FILTER_NO_OB_CAMERA = (1 << 10), SO_FILTER_NO_OB_CAMERA = (1 << 10),
SO_FILTER_NO_OB_OTHERS = (1 << 11), SO_FILTER_NO_OB_OTHERS = (1 << 11),
SO_FILTER_UNUSED_12 = (1 << 12), /* cleared */ SO_FILTER_OB_STATE_SELECTABLE = (1 << 12), /* Not set via DNA */
natecraddockUnsubmitted
Done
Inline Actions

Add a . at the end of the comment for consistency

natecraddock: Add a `.` at the end of the comment for consistency
SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */ SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */
SO_FILTER_OB_STATE_HIDDEN = (1 << 14), /* Not set via DNA. */ SO_FILTER_OB_STATE_HIDDEN = (1 << 14), /* Not set via DNA. */
SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */ SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */
SO_FILTER_OB_STATE_ACTIVE = (1 << 16), /* Not set via DNA. */ SO_FILTER_OB_STATE_ACTIVE = (1 << 16), /* Not set via DNA. */
SO_FILTER_NO_COLLECTION = (1 << 17), SO_FILTER_NO_COLLECTION = (1 << 17),
natecraddockUnsubmitted
Not Done
Inline Actions

I believe that inserting SO_FILTER_OB_STATE_UNSELECTABLE into the enum will cause older files to read the filter flags incorrectly

natecraddock: I believe that inserting SO_FILTER_OB_STATE_UNSELECTABLE into the enum will cause older files…
SO_FILTER_ID_TYPE = (1 << 18), SO_FILTER_ID_TYPE = (1 << 18),
} eSpaceOutliner_Filter; } eSpaceOutliner_Filter;
#define SO_FILTER_OB_TYPE \ #define SO_FILTER_OB_TYPE \
(SO_FILTER_NO_OB_MESH | SO_FILTER_NO_OB_ARMATURE | SO_FILTER_NO_OB_EMPTY | \ (SO_FILTER_NO_OB_MESH | SO_FILTER_NO_OB_ARMATURE | SO_FILTER_NO_OB_EMPTY | \
SO_FILTER_NO_OB_LAMP | SO_FILTER_NO_OB_CAMERA | SO_FILTER_NO_OB_OTHERS) SO_FILTER_NO_OB_LAMP | SO_FILTER_NO_OB_CAMERA | SO_FILTER_NO_OB_OTHERS)
#define SO_FILTER_OB_STATE \ #define SO_FILTER_OB_STATE \
(SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_HIDDEN | SO_FILTER_OB_STATE_SELECTED | \ (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_HIDDEN | SO_FILTER_OB_STATE_SELECTED | \
SO_FILTER_OB_STATE_ACTIVE) SO_FILTER_OB_STATE_ACTIVE | SO_FILTER_OB_STATE_SELECTABLE)
#define SO_FILTER_ANY \ #define SO_FILTER_ANY \
(SO_FILTER_NO_OB_CONTENT | SO_FILTER_NO_CHILDREN | SO_FILTER_OB_TYPE | SO_FILTER_OB_STATE | \ (SO_FILTER_NO_OB_CONTENT | SO_FILTER_NO_CHILDREN | SO_FILTER_OB_TYPE | SO_FILTER_OB_STATE | \
SO_FILTER_NO_COLLECTION) SO_FILTER_NO_COLLECTION)
/* SpaceOutliner.filter_state */ /* SpaceOutliner.filter_state */
typedef enum eSpaceOutliner_StateFilter { typedef enum eSpaceOutliner_StateFilter {
SO_FILTER_OB_ALL = 0, SO_FILTER_OB_ALL = 0,
SO_FILTER_OB_VISIBLE = 1, SO_FILTER_OB_VISIBLE = 1,
SO_FILTER_OB_HIDDEN = 2, SO_FILTER_OB_HIDDEN = 2,
SO_FILTER_OB_SELECTED = 3, SO_FILTER_OB_SELECTED = 3,
SO_FILTER_OB_ACTIVE = 4, SO_FILTER_OB_ACTIVE = 4,
SO_FILTER_OB_SELECTABLE = 5,
} eSpaceOutliner_StateFilter; } eSpaceOutliner_StateFilter;
/* SpaceOutliner.show_restrict_flags */ /* SpaceOutliner.show_restrict_flags */
typedef enum eSpaceOutliner_ShowRestrictFlag { typedef enum eSpaceOutliner_ShowRestrictFlag {
SO_RESTRICT_ENABLE = (1 << 0), SO_RESTRICT_ENABLE = (1 << 0),
SO_RESTRICT_SELECT = (1 << 1), SO_RESTRICT_SELECT = (1 << 1),
SO_RESTRICT_HIDE = (1 << 2), SO_RESTRICT_HIDE = (1 << 2),
SO_RESTRICT_VIEWPORT = (1 << 3), SO_RESTRICT_VIEWPORT = (1 << 3),
▲ Show 20 Lines • Show All 1,409 Lines • Show Last 20 Lines