Cleanup: label scene flags more clearly
Also correct typo in enum name
This commit is contained in:
parent
2be8598fe7
commit
9b04a47070
|
|
@ -285,7 +285,7 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
|
|||
float p[2], w[3], absw, minabsw;
|
||||
float matrix[4][4], proj[4][4];
|
||||
GLint view[4];
|
||||
const eImageePaintMode mode = scene->toolsettings->imapaint.mode;
|
||||
const eImagePaintMode mode = scene->toolsettings->imapaint.mode;
|
||||
const MLoopTri *lt = dm->getLoopTriArray(dm);
|
||||
const MPoly *mpoly = dm->getPolyArray(dm);
|
||||
const MLoop *mloop = dm->getLoopArray(dm);
|
||||
|
|
|
|||
|
|
@ -183,12 +183,14 @@ typedef struct SceneRenderLayer {
|
|||
struct Material *mat_override;
|
||||
struct Group *light_override;
|
||||
|
||||
unsigned int lay; /* scene->lay itself has priority over this */
|
||||
unsigned int lay; /* Scene.lay itself has priority over this */
|
||||
unsigned int lay_zmask; /* has to be after lay, this is for Z-masking */
|
||||
unsigned int lay_exclude; /* not used by internal, exclude */
|
||||
int layflag;
|
||||
|
||||
int passflag; /* pass_xor has to be after passflag */
|
||||
|
||||
/* pass_xor has to be after passflag */
|
||||
/* note, this is treestore element 'nr' in outliner, short still... */
|
||||
int passflag;
|
||||
int pass_xor;
|
||||
|
||||
int samples;
|
||||
|
|
@ -199,7 +201,7 @@ typedef struct SceneRenderLayer {
|
|||
struct FreestyleConfig freestyleConfig;
|
||||
} SceneRenderLayer;
|
||||
|
||||
/* srl->layflag */
|
||||
/* SceneRenderLayer.layflag */
|
||||
#define SCE_LAY_SOLID 1
|
||||
#define SCE_LAY_ZTRA 2
|
||||
#define SCE_LAY_HALO 4
|
||||
|
|
@ -216,7 +218,7 @@ typedef struct SceneRenderLayer {
|
|||
#define SCE_LAY_ZMASK 0x40000
|
||||
#define SCE_LAY_NEG_ZMASK 0x80000
|
||||
|
||||
/* srl->passflag */
|
||||
/* SceneRenderLayer.passflag */
|
||||
typedef enum eScenePassType {
|
||||
SCE_PASS_COMBINED = (1 << 0),
|
||||
SCE_PASS_Z = (1 << 1),
|
||||
|
|
@ -286,7 +288,6 @@ typedef enum eScenePassType {
|
|||
#define RE_PASSNAME_SUBSURFACE_INDIRECT "SubsurfaceInd"
|
||||
#define RE_PASSNAME_SUBSURFACE_COLOR "SubsurfaceCol"
|
||||
|
||||
/* note, srl->passflag is treestore element 'nr' in outliner, short still... */
|
||||
|
||||
/* View - MultiView */
|
||||
typedef struct SceneRenderView {
|
||||
|
|
@ -301,16 +302,16 @@ typedef struct SceneRenderView {
|
|||
|
||||
} SceneRenderView;
|
||||
|
||||
/* srv->viewflag */
|
||||
/* SceneRenderView.viewflag */
|
||||
#define SCE_VIEW_DISABLE (1<<0)
|
||||
|
||||
/* scene.render.views_format */
|
||||
/* RenderData.views_format */
|
||||
enum {
|
||||
SCE_VIEWS_FORMAT_STEREO_3D = 0,
|
||||
SCE_VIEWS_FORMAT_MULTIVIEW = 1,
|
||||
};
|
||||
|
||||
/* ImageFormatData.views_output */
|
||||
/* ImageFormatData.views_format (also used for Sequence.views_format) */
|
||||
enum {
|
||||
R_IMF_VIEWS_INDIVIDUAL = 0,
|
||||
R_IMF_VIEWS_STEREO_3D = 1,
|
||||
|
|
@ -510,7 +511,7 @@ typedef struct BakeData {
|
|||
char cage[64]; /* MAX_NAME */
|
||||
} BakeData;
|
||||
|
||||
/* (char) normal_swizzle */
|
||||
/* BakeData.normal_swizzle (char) */
|
||||
typedef enum eBakeNormalSwizzle {
|
||||
R_BAKE_POSX = 0,
|
||||
R_BAKE_POSY = 1,
|
||||
|
|
@ -520,13 +521,13 @@ typedef enum eBakeNormalSwizzle {
|
|||
R_BAKE_NEGZ = 5,
|
||||
} eBakeNormalSwizzle;
|
||||
|
||||
/* (char) save_mode */
|
||||
/* BakeData.save_mode (char) */
|
||||
typedef enum eBakeSaveMode {
|
||||
R_BAKE_SAVE_INTERNAL = 0,
|
||||
R_BAKE_SAVE_EXTERNAL = 1,
|
||||
} eBakeSaveMode;
|
||||
|
||||
/* bake->pass_filter */
|
||||
/* BakeData.pass_filter */
|
||||
typedef enum eBakePassFilter {
|
||||
R_BAKE_PASS_FILTER_NONE = 0,
|
||||
R_BAKE_PASS_FILTER_AO = (1 << 0),
|
||||
|
|
@ -796,6 +797,7 @@ typedef struct GameDome {
|
|||
struct Text *warptext;
|
||||
} GameDome;
|
||||
|
||||
/* GameDome.mode */
|
||||
#define DOME_FISHEYE 1
|
||||
#define DOME_TRUNCATED_FRONT 2
|
||||
#define DOME_TRUNCATED_REAR 3
|
||||
|
|
@ -811,6 +813,7 @@ typedef struct GameFraming {
|
|||
char type, pad1, pad2, pad3;
|
||||
} GameFraming;
|
||||
|
||||
/* GameFraming.type */
|
||||
#define SCE_GAMEFRAMING_BARS 0
|
||||
#define SCE_GAMEFRAMING_EXTEND 1
|
||||
#define SCE_GAMEFRAMING_SCALE 2
|
||||
|
|
@ -834,6 +837,7 @@ typedef struct RecastData {
|
|||
short pad2;
|
||||
} RecastData;
|
||||
|
||||
/* RecastData.partitioning */
|
||||
#define RC_PARTITION_WATERSHED 0
|
||||
#define RC_PARTITION_MONOTONE 1
|
||||
#define RC_PARTITION_LAYERS 2
|
||||
|
|
@ -883,10 +887,12 @@ typedef struct GameData {
|
|||
|
||||
} GameData;
|
||||
|
||||
/* GameData.stereoflag */
|
||||
#define STEREO_NOSTEREO 1
|
||||
#define STEREO_ENABLED 2
|
||||
#define STEREO_DOME 3
|
||||
|
||||
/* GameData.stereomode */
|
||||
//#define STEREO_NOSTEREO 1
|
||||
#define STEREO_QUADBUFFERED 2
|
||||
#define STEREO_ABOVEBELOW 3
|
||||
|
|
@ -897,7 +903,7 @@ typedef struct GameData {
|
|||
//#define STEREO_DOME 8
|
||||
#define STEREO_3DTVTOPBOTTOM 9
|
||||
|
||||
/* physicsEngine */
|
||||
/* GameData.physicsEngine */
|
||||
#define WOPHY_NONE 0
|
||||
#define WOPHY_BULLET 5
|
||||
|
||||
|
|
@ -906,13 +912,13 @@ typedef struct GameData {
|
|||
#define OBSTSIMULATION_TOI_rays 1
|
||||
#define OBSTSIMULATION_TOI_cells 2
|
||||
|
||||
/* Raster storage */
|
||||
/* GameData.raster_storage */
|
||||
#define RAS_STORE_AUTO 0
|
||||
#define RAS_STORE_IMMEDIATE 1
|
||||
/* #define RAS_STORE_IMMEDIATE 1 */ /* DEPRECATED */
|
||||
#define RAS_STORE_VA 2
|
||||
#define RAS_STORE_VBO 3
|
||||
|
||||
/* vsync */
|
||||
/* GameData.vsync */
|
||||
#define VSYNC_ON 0
|
||||
#define VSYNC_OFF 1
|
||||
#define VSYNC_ADAPTIVE 2
|
||||
|
|
@ -956,13 +962,16 @@ enum {
|
|||
#define SCE_LOD_USE_HYST (1 << 0)
|
||||
|
||||
/* UV Paint */
|
||||
/* ToolSettings.uv_sculpt_settings */
|
||||
#define UV_SCULPT_LOCK_BORDERS 1
|
||||
#define UV_SCULPT_ALL_ISLANDS 2
|
||||
|
||||
/* ToolSettings.uv_sculpt_tool */
|
||||
#define UV_SCULPT_TOOL_PINCH 1
|
||||
#define UV_SCULPT_TOOL_RELAX 2
|
||||
#define UV_SCULPT_TOOL_GRAB 3
|
||||
|
||||
/* ToolSettings.uv_relax_method */
|
||||
#define UV_SCULPT_TOOL_RELAX_LAPLACIAN 1
|
||||
#define UV_SCULPT_TOOL_RELAX_HC 2
|
||||
|
||||
|
|
@ -972,6 +981,7 @@ enum {
|
|||
#define STEREO_RIGHT_SUFFIX "_R"
|
||||
#define STEREO_LEFT_SUFFIX "_L"
|
||||
|
||||
/* View3D.stereo3d_camera / View3D.multiview_eye / ImageUser.multiview_eye */
|
||||
typedef enum eStereoViews {
|
||||
STEREO_LEFT_ID = 0,
|
||||
STEREO_RIGHT_ID = 1,
|
||||
|
|
@ -982,7 +992,7 @@ typedef enum eStereoViews {
|
|||
/* *************************************************************** */
|
||||
/* Markers */
|
||||
|
||||
typedef struct TimeMarker {
|
||||
typedef struct TimeMarker {
|
||||
struct TimeMarker *next, *prev;
|
||||
int frame;
|
||||
char name[64];
|
||||
|
|
@ -1131,7 +1141,7 @@ enum {
|
|||
/* ------------------------------------------- */
|
||||
/* GPencil Stroke Sculpting */
|
||||
|
||||
/* Brush types */
|
||||
/* GP_BrushEdit_Settings.brushtype */
|
||||
typedef enum eGP_EditBrush_Types {
|
||||
GP_EDITBRUSH_TYPE_SMOOTH = 0,
|
||||
GP_EDITBRUSH_TYPE_THICKNESS = 1,
|
||||
|
|
@ -1149,7 +1159,7 @@ typedef enum eGP_EditBrush_Types {
|
|||
TOT_GP_EDITBRUSH_TYPES
|
||||
} eGP_EditBrush_Types;
|
||||
|
||||
/* Lock axis options */
|
||||
/* GP_BrushEdit_Settings.lock_axis */
|
||||
typedef enum eGP_Lockaxis_Types {
|
||||
GP_LOCKAXIS_NONE = 0,
|
||||
GP_LOCKAXIS_X = 1,
|
||||
|
|
@ -1187,7 +1197,7 @@ typedef struct GP_BrushEdit_Settings {
|
|||
|
||||
int brushtype; /* eGP_EditBrush_Types */
|
||||
int flag; /* eGP_BrushEdit_SettingsFlag */
|
||||
int lock_axis; /* lock drawing to one axis */
|
||||
int lock_axis; /* eGP_Lockaxis_Types lock drawing to one axis */
|
||||
float alpha; /* alpha factor for selection color */
|
||||
} GP_BrushEdit_Settings;
|
||||
|
||||
|
|
@ -1337,6 +1347,7 @@ typedef struct UnifiedPaintSettings {
|
|||
struct ColorSpace *colorspace;
|
||||
} UnifiedPaintSettings;
|
||||
|
||||
/* UnifiedPaintSettings.flag */
|
||||
typedef enum {
|
||||
UNIFIED_PAINT_SIZE = (1 << 0),
|
||||
UNIFIED_PAINT_ALPHA = (1 << 1),
|
||||
|
|
@ -1698,14 +1709,14 @@ typedef struct Scene {
|
|||
|
||||
/* **************** RENDERDATA ********************* */
|
||||
|
||||
/* flag */
|
||||
/* RenderData.flag */
|
||||
/* use preview range */
|
||||
#define SCER_PRV_RANGE (1<<0)
|
||||
#define SCER_LOCK_FRAME_SELECTION (1<<1)
|
||||
/* show/use subframes (for checking motion blur) */
|
||||
#define SCER_SHOW_SUBFRAME (1<<3)
|
||||
|
||||
/* mode (int now) */
|
||||
/* RenderData.mode */
|
||||
#define R_OSA 0x0001
|
||||
#define R_SHADOW 0x0002
|
||||
#define R_GAMMA 0x0004
|
||||
|
|
@ -1741,7 +1752,7 @@ typedef struct Scene {
|
|||
#define R_PERSISTENT_DATA 0x4000000 /* keep data around for re-render */
|
||||
#define R_USE_WS_SHADING 0x8000000 /* use world space interpretation of lighting data */
|
||||
|
||||
/* seq_flag */
|
||||
/* RenderData.seq_flag */
|
||||
enum {
|
||||
// R_SEQ_GL_PREV = (1 << 1), // UNUSED, we just use setting from seq_prev_type now.
|
||||
// R_SEQ_GL_REND = (1 << 2), // UNUSED, opengl render has its own operator now.
|
||||
|
|
@ -1749,15 +1760,14 @@ enum {
|
|||
R_SEQ_CAMERA_DOF = (1 << 4),
|
||||
};
|
||||
|
||||
/* displaymode */
|
||||
|
||||
/* RenderData.displaymode */
|
||||
#define R_OUTPUT_SCREEN 0
|
||||
#define R_OUTPUT_AREA 1
|
||||
#define R_OUTPUT_WINDOW 2
|
||||
#define R_OUTPUT_NONE 3
|
||||
/*#define R_OUTPUT_FORKED 4*/
|
||||
|
||||
/* filtertype */
|
||||
/* RenderData.filtertype */
|
||||
#define R_FILTER_BOX 0
|
||||
#define R_FILTER_TENT 1
|
||||
#define R_FILTER_QUAD 2
|
||||
|
|
@ -1767,7 +1777,7 @@ enum {
|
|||
#define R_FILTER_MITCH 6
|
||||
#define R_FILTER_FAST_GAUSS 7 /* note, this is only used for nodes at the moment */
|
||||
|
||||
/* raytrace structure */
|
||||
/* RenderData.raytrace_structure */
|
||||
#define R_RAYSTRUCTURE_AUTO 0
|
||||
#define R_RAYSTRUCTURE_OCTREE 1
|
||||
#define R_RAYSTRUCTURE_BLIBVH 2 /* removed */
|
||||
|
|
@ -1775,11 +1785,11 @@ enum {
|
|||
#define R_RAYSTRUCTURE_SIMD_SVBVH 4 /* needs SIMD */
|
||||
#define R_RAYSTRUCTURE_SIMD_QBVH 5 /* needs SIMD */
|
||||
|
||||
/* raytrace_options */
|
||||
/* RenderData.raytrace_options */
|
||||
#define R_RAYTRACE_USE_LOCAL_COORDS 0x0001
|
||||
#define R_RAYTRACE_USE_INSTANCES 0x0002
|
||||
|
||||
/* scemode (int now) */
|
||||
/* RenderData.scemode (int now) */
|
||||
#define R_DOSEQ 0x0001
|
||||
#define R_BG_RENDER 0x0002
|
||||
/* passepartout is camera option now, keep this for backward compatibility */
|
||||
|
|
@ -1804,7 +1814,7 @@ enum {
|
|||
#define R_EXR_CACHE_FILE 0x100000
|
||||
#define R_MULTIVIEW 0x200000
|
||||
|
||||
/* r->stamp */
|
||||
/* RenderData.stamp */
|
||||
#define R_STAMP_TIME 0x0001
|
||||
#define R_STAMP_FRAME 0x0002
|
||||
#define R_STAMP_DATE 0x0004
|
||||
|
|
@ -1825,19 +1835,19 @@ enum {
|
|||
R_STAMP_RENDERTIME|R_STAMP_CAMERALENS|R_STAMP_MEMORY| \
|
||||
R_STAMP_HIDE_LABELS)
|
||||
|
||||
/* alphamode */
|
||||
/* RenderData.alphamode */
|
||||
#define R_ADDSKY 0
|
||||
#define R_ALPHAPREMUL 1
|
||||
/*#define R_ALPHAKEY 2*/ /* deprecated, shouldn't be used */
|
||||
|
||||
/* color_mgt_flag */
|
||||
/* RenderData.color_mgt_flag */
|
||||
enum {
|
||||
R_COLOR_MANAGEMENT = (1 << 0), /* deprecated, should only be used in versioning code only */
|
||||
/*R_COLOR_MANAGEMENT_PREDIVIDE = (1 << 1)*/ /* deprecated, shouldn't be used */
|
||||
};
|
||||
|
||||
#ifdef DNA_DEPRECATED
|
||||
/* subimtype, flag options for imtype */
|
||||
/* RenderData.subimtype flag options for imtype */
|
||||
enum {
|
||||
R_OPENEXR_HALF = 1, /*deprecated*/
|
||||
R_OPENEXR_ZBUF = 2, /*deprecated*/
|
||||
|
|
@ -1854,7 +1864,7 @@ enum {
|
|||
#endif
|
||||
|
||||
/* bake_mode: same as RE_BAKE_xxx defines */
|
||||
/* bake_flag: */
|
||||
/* RenderData.bake_flag */
|
||||
#define R_BAKE_CLEAR 1
|
||||
#define R_BAKE_OSA 2
|
||||
#define R_BAKE_TO_ACTIVE 4
|
||||
|
|
@ -1867,22 +1877,22 @@ enum {
|
|||
#define R_BAKE_SPLIT_MAT 512
|
||||
#define R_BAKE_AUTO_NAME 1024
|
||||
|
||||
/* bake_normal_space */
|
||||
/* RenderData.bake_normal_space */
|
||||
#define R_BAKE_SPACE_CAMERA 0
|
||||
#define R_BAKE_SPACE_WORLD 1
|
||||
#define R_BAKE_SPACE_OBJECT 2
|
||||
#define R_BAKE_SPACE_TANGENT 3
|
||||
|
||||
/* simplify_flag */
|
||||
/* RenderData.simplify_flag */
|
||||
#define R_SIMPLE_NO_TRIANGULATE 1
|
||||
|
||||
/* line_thickness_mode */
|
||||
/* RenderData.line_thickness_mode */
|
||||
#define R_LINE_THICKNESS_ABSOLUTE 1
|
||||
#define R_LINE_THICKNESS_RELATIVE 2
|
||||
|
||||
/* sequencer seq_prev_type seq_rend_type */
|
||||
|
||||
/* scene->r.engine (scene.c) */
|
||||
/* RenderData.engine (scene.c) */
|
||||
extern const char *RE_engine_id_BLENDER_RENDER;
|
||||
extern const char *RE_engine_id_BLENDER_GAME;
|
||||
extern const char *RE_engine_id_CYCLES;
|
||||
|
|
@ -1951,9 +1961,9 @@ extern const char *RE_engine_id_CYCLES;
|
|||
#define TIME2FRA(a) ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
|
||||
#define FPS (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base)
|
||||
|
||||
/* base->flag is in DNA_object_types.h */
|
||||
/* Base.flag is in DNA_object_types.h */
|
||||
|
||||
/* toolsettings->snap_flag */
|
||||
/* ToolSettings.snap_flag */
|
||||
#define SCE_SNAP 1
|
||||
#define SCE_SNAP_ROTATE 2
|
||||
#define SCE_SNAP_PEEL_OBJECT 4
|
||||
|
|
@ -1961,12 +1971,12 @@ extern const char *RE_engine_id_CYCLES;
|
|||
#define SCE_SNAP_NO_SELF 16
|
||||
#define SCE_SNAP_ABS_GRID 32
|
||||
|
||||
/* toolsettings->snap_target */
|
||||
/* ToolSettings.snap_target */
|
||||
#define SCE_SNAP_TARGET_CLOSEST 0
|
||||
#define SCE_SNAP_TARGET_CENTER 1
|
||||
#define SCE_SNAP_TARGET_MEDIAN 2
|
||||
#define SCE_SNAP_TARGET_ACTIVE 3
|
||||
/* toolsettings->snap_mode */
|
||||
/* ToolSettings.snap_mode */
|
||||
#define SCE_SNAP_MODE_INCREMENT 0
|
||||
#define SCE_SNAP_MODE_VERTEX 1
|
||||
#define SCE_SNAP_MODE_EDGE 2
|
||||
|
|
@ -1977,24 +1987,24 @@ extern const char *RE_engine_id_CYCLES;
|
|||
#define SCE_SNAP_MODE_NODE_XY 7
|
||||
#define SCE_SNAP_MODE_GRID 8
|
||||
|
||||
/* toolsettings->selectmode */
|
||||
/* ToolSettings.selectmode */
|
||||
#define SCE_SELECT_VERTEX 1 /* for mesh */
|
||||
#define SCE_SELECT_EDGE 2
|
||||
#define SCE_SELECT_FACE 4
|
||||
|
||||
/* toolsettings->statvis->type */
|
||||
/* MeshStatVis.type */
|
||||
#define SCE_STATVIS_OVERHANG 0
|
||||
#define SCE_STATVIS_THICKNESS 1
|
||||
#define SCE_STATVIS_INTERSECT 2
|
||||
#define SCE_STATVIS_DISTORT 3
|
||||
#define SCE_STATVIS_SHARP 4
|
||||
|
||||
/* toolsettings->particle.selectmode for particles */
|
||||
/* ParticleEditSettings.selectmode for particles */
|
||||
#define SCE_SELECT_PATH 1
|
||||
#define SCE_SELECT_POINT 2
|
||||
#define SCE_SELECT_END 4
|
||||
|
||||
/* toolsettings->prop_mode (proportional falloff) */
|
||||
/* ToolSettings.prop_mode (proportional falloff) */
|
||||
#define PROP_SMOOTH 0
|
||||
#define PROP_SPHERE 1
|
||||
#define PROP_ROOT 2
|
||||
|
|
@ -2005,21 +2015,21 @@ extern const char *RE_engine_id_CYCLES;
|
|||
#define PROP_INVSQUARE 7
|
||||
#define PROP_MODE_MAX 8
|
||||
|
||||
/* toolsettings->proportional */
|
||||
/* ToolSettings.proportional */
|
||||
#define PROP_EDIT_OFF 0
|
||||
#define PROP_EDIT_ON 1
|
||||
#define PROP_EDIT_CONNECTED 2
|
||||
#define PROP_EDIT_PROJECTED 3
|
||||
|
||||
/* toolsettings->weightuser */
|
||||
/* ToolSettings.weightuser */
|
||||
enum {
|
||||
OB_DRAW_GROUPUSER_NONE = 0,
|
||||
OB_DRAW_GROUPUSER_ACTIVE = 1,
|
||||
OB_DRAW_GROUPUSER_ALL = 2
|
||||
};
|
||||
|
||||
/* toolsettings->vgroupsubset */
|
||||
/* object_vgroup.c */
|
||||
/* ToolSettings.vgroupsubset */
|
||||
typedef enum eVGroupSelect {
|
||||
WT_VGROUP_ALL = 0,
|
||||
WT_VGROUP_ACTIVE = 1,
|
||||
|
|
@ -2036,26 +2046,26 @@ typedef enum eVGroupSelect {
|
|||
(1 << WT_VGROUP_ALL))
|
||||
|
||||
|
||||
/* sce->flag */
|
||||
/* Scene.flag */
|
||||
#define SCE_DS_SELECTED (1<<0)
|
||||
#define SCE_DS_COLLAPSED (1<<1)
|
||||
#define SCE_NLA_EDIT_ON (1<<2)
|
||||
#define SCE_FRAME_DROP (1<<3)
|
||||
#define SCE_KEYS_NO_SELONLY (1<<4)
|
||||
|
||||
|
||||
/* return flag BKE_scene_base_iter_next functions */
|
||||
/* #define F_ERROR -1 */ /* UNUSED */
|
||||
#define F_START 0
|
||||
#define F_SCENE 1
|
||||
#define F_DUPLI 3
|
||||
|
||||
/* audio->flag */
|
||||
/* AudioData.flag */
|
||||
#define AUDIO_MUTE (1<<0)
|
||||
#define AUDIO_SYNC (1<<1)
|
||||
#define AUDIO_SCRUB (1<<2)
|
||||
#define AUDIO_VOLUME_ANIMATED (1<<3)
|
||||
|
||||
/* FFMpegCodecData.flags */
|
||||
enum {
|
||||
#ifdef DNA_DEPRECATED
|
||||
FFMPEG_MULTIPLEX_AUDIO = 1, /* deprecated, you can choose none as audiocodec now */
|
||||
|
|
@ -2124,10 +2134,11 @@ typedef enum eSculptFlags {
|
|||
SCULPT_HIDE_MASK = (1 << 15),
|
||||
} eSculptFlags;
|
||||
|
||||
typedef enum eImageePaintMode {
|
||||
/* ImagePaintSettings.mode */
|
||||
typedef enum eImagePaintMode {
|
||||
IMAGEPAINT_MODE_MATERIAL, /* detect texture paint slots from the material */
|
||||
IMAGEPAINT_MODE_IMAGE, /* select texture paint image directly */
|
||||
} eImageePaintMode;
|
||||
} eImagePaintMode;
|
||||
|
||||
/* ImagePaintSettings.flag */
|
||||
#define IMAGEPAINT_DRAWING 1
|
||||
|
|
@ -2135,6 +2146,7 @@ typedef enum eImageePaintMode {
|
|||
// #define IMAGEPAINT_DRAW_TOOL_DRAWING 4 // deprecated
|
||||
|
||||
/* projection painting only */
|
||||
/* ImagePaintSettings.flag */
|
||||
#define IMAGEPAINT_PROJECT_XRAY (1 << 4)
|
||||
#define IMAGEPAINT_PROJECT_BACKFACE (1 << 5)
|
||||
#define IMAGEPAINT_PROJECT_FLAT (1 << 6)
|
||||
|
|
@ -2142,29 +2154,29 @@ typedef enum eImageePaintMode {
|
|||
#define IMAGEPAINT_PROJECT_LAYER_STENCIL (1 << 8)
|
||||
#define IMAGEPAINT_PROJECT_LAYER_STENCIL_INV (1 << 9)
|
||||
|
||||
|
||||
/* ImagePaintSettings.missing_data */
|
||||
#define IMAGEPAINT_MISSING_UVS (1 << 0)
|
||||
#define IMAGEPAINT_MISSING_MATERIAL (1 << 1)
|
||||
#define IMAGEPAINT_MISSING_TEX (1 << 2)
|
||||
#define IMAGEPAINT_MISSING_STENCIL (1 << 3)
|
||||
|
||||
/* toolsettings->uvcalc_flag */
|
||||
/* ToolSettings.uvcalc_flag */
|
||||
#define UVCALC_FILLHOLES 1
|
||||
#define UVCALC_NO_ASPECT_CORRECT 2 /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
|
||||
#define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to avoid distortion */
|
||||
#define UVCALC_USESUBSURF 8 /* Use mesh data after subsurf to compute UVs*/
|
||||
|
||||
/* toolsettings->uv_flag */
|
||||
/* ToolSettings.uv_flag */
|
||||
#define UV_SYNC_SELECTION 1
|
||||
#define UV_SHOW_SAME_IMAGE 2
|
||||
|
||||
/* toolsettings->uv_selectmode */
|
||||
/* ToolSettings.uv_selectmode */
|
||||
#define UV_SELECT_VERTEX 1
|
||||
#define UV_SELECT_EDGE 2
|
||||
#define UV_SELECT_FACE 4
|
||||
#define UV_SELECT_ISLAND 8
|
||||
|
||||
/* toolsettings->edge_mode */
|
||||
/* ToolSettings.edge_mode */
|
||||
#define EDGE_MODE_SELECT 0
|
||||
#define EDGE_MODE_TAG_SEAM 1
|
||||
#define EDGE_MODE_TAG_SHARP 2
|
||||
|
|
@ -2172,7 +2184,7 @@ typedef enum eImageePaintMode {
|
|||
#define EDGE_MODE_TAG_BEVEL 4
|
||||
#define EDGE_MODE_TAG_FREESTYLE 5
|
||||
|
||||
/* toolsettings->gpencil_flags */
|
||||
/* ToolSettings.gpencil_flags */
|
||||
typedef enum eGPencil_Flags {
|
||||
/* "Continuous Drawing" - The drawing operator enters a mode where multiple strokes can be drawn */
|
||||
GP_TOOL_FLAG_PAINTSESSIONS_ON = (1 << 0),
|
||||
|
|
@ -2182,13 +2194,13 @@ typedef enum eGPencil_Flags {
|
|||
GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2)
|
||||
} eGPencil_Flags;
|
||||
|
||||
/* toolsettings->gpencil_src */
|
||||
/* ToolSettings.gpencil_src */
|
||||
typedef enum eGPencil_Source_3D {
|
||||
GP_TOOL_SOURCE_SCENE = 0,
|
||||
GP_TOOL_SOURCE_OBJECT = 1
|
||||
} eGPencil_Source_3d;
|
||||
|
||||
/* toolsettings->gpencil_*_align - Stroke Placement mode flags */
|
||||
/* ToolSettings.gpencil_*_align - Stroke Placement mode flags */
|
||||
typedef enum eGPencil_Placement_Flags {
|
||||
/* New strokes are added in viewport/data space (i.e. not screen space) */
|
||||
GP_PROJECT_VIEWSPACE = (1 << 0),
|
||||
|
|
@ -2204,7 +2216,7 @@ typedef enum eGPencil_Placement_Flags {
|
|||
GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
|
||||
} eGPencil_Placement_Flags;
|
||||
|
||||
/* toolsettings->particle flag */
|
||||
/* ToolSettings.particle flag */
|
||||
#define PE_KEEP_LENGTHS 1
|
||||
#define PE_LOCK_FIRST 2
|
||||
#define PE_DEFLECT_EMITTER 4
|
||||
|
|
@ -2214,7 +2226,7 @@ typedef enum eGPencil_Placement_Flags {
|
|||
#define PE_FADE_TIME 128
|
||||
#define PE_AUTO_VELOCITY 256
|
||||
|
||||
/* toolsetting->particle brushtype */
|
||||
/* ParticleEditSettings.brushtype */
|
||||
#define PE_BRUSH_NONE -1
|
||||
#define PE_BRUSH_COMB 0
|
||||
#define PE_BRUSH_CUT 1
|
||||
|
|
@ -2227,15 +2239,15 @@ typedef enum eGPencil_Placement_Flags {
|
|||
/* this must equal ParticleEditSettings.brush array size */
|
||||
#define PE_TOT_BRUSH 6
|
||||
|
||||
/* ParticleBrushData->flag */
|
||||
/* ParticleBrushData.flag */
|
||||
#define PE_BRUSH_DATA_PUFF_VOLUME 1
|
||||
|
||||
/* tooksettings->particle edittype */
|
||||
/* ParticleBrushData.edittype */
|
||||
#define PE_TYPE_PARTICLES 0
|
||||
#define PE_TYPE_SOFTBODY 1
|
||||
#define PE_TYPE_CLOTH 2
|
||||
|
||||
/* toolsettings->skgen_options */
|
||||
/* ToolSettings.skgen_options */
|
||||
#define SKGEN_FILTER_INTERNAL (1 << 0)
|
||||
#define SKGEN_FILTER_EXTERNAL (1 << 1)
|
||||
#define SKGEN_SYMMETRY (1 << 2)
|
||||
|
|
@ -2257,40 +2269,40 @@ typedef enum eGPencil_Placement_Flags {
|
|||
#define SKGEN_SUB_CORRELATION 2
|
||||
#define SKGEN_SUB_TOTAL 3
|
||||
|
||||
/* toolsettings->skgen_postpro */
|
||||
/* ToolSettings.skgen_postpro */
|
||||
#define SKGEN_SMOOTH 0
|
||||
#define SKGEN_AVERAGE 1
|
||||
#define SKGEN_SHARPEN 2
|
||||
|
||||
/* toolsettings->bone_sketching */
|
||||
/* ToolSettings.bone_sketching */
|
||||
#define BONE_SKETCHING 1
|
||||
#define BONE_SKETCHING_QUICK 2
|
||||
#define BONE_SKETCHING_ADJUST 4
|
||||
|
||||
/* toolsettings->bone_sketching_convert */
|
||||
/* ToolSettings.bone_sketching_convert */
|
||||
#define SK_CONVERT_CUT_FIXED 0
|
||||
#define SK_CONVERT_CUT_LENGTH 1
|
||||
#define SK_CONVERT_CUT_ADAPTATIVE 2
|
||||
#define SK_CONVERT_RETARGET 3
|
||||
|
||||
/* toolsettings->skgen_retarget_options */
|
||||
/* ToolSettings.skgen_retarget_options */
|
||||
#define SK_RETARGET_AUTONAME 1
|
||||
|
||||
/* toolsettings->skgen_retarget_roll */
|
||||
/* ToolSettings.skgen_retarget_roll */
|
||||
#define SK_RETARGET_ROLL_NONE 0
|
||||
#define SK_RETARGET_ROLL_VIEW 1
|
||||
#define SK_RETARGET_ROLL_JOINT 2
|
||||
|
||||
/* physics_settings->flag */
|
||||
/* PhysicsSettings.flag */
|
||||
#define PHYS_GLOBAL_GRAVITY 1
|
||||
|
||||
/* UnitSettings */
|
||||
|
||||
/* UnitSettings->system */
|
||||
/* UnitSettings.system */
|
||||
#define USER_UNIT_NONE 0
|
||||
#define USER_UNIT_METRIC 1
|
||||
#define USER_UNIT_IMPERIAL 2
|
||||
/* UnitSettings->flag */
|
||||
/* UnitSettings.flag */
|
||||
#define USER_UNIT_OPT_SPLIT 1
|
||||
#define USER_UNIT_ROT_RADIANS 2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue