diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
commit | 87627374000b7de7445736a7239a3f2b168ce7eb (patch) | |
tree | 2f0fe5d42d0938fc1b684af702d8613099bea1bd /source/blender/makesdna | |
parent | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (diff) | |
parent | ba8ea9ec63c25b1ce134a846176f7bf252f4d487 (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 20 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 12 |
3 files changed, 23 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 1c49489c3c5..37995145ff8 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -102,7 +102,7 @@ typedef struct bPoseChannel { /* PoseChannel (transform) flags */ -enum { +typedef enum ePchan_Flag { POSE_LOC = 0x0001, POSE_ROT = 0x0002, POSE_SIZE = 0x0004, @@ -119,7 +119,7 @@ enum { } ePchan_Flag; /* PoseChannel constflag (constraint detection) */ -enum { +typedef enum ePchan_ConstFlag { PCHAN_HAS_IK = (1<<0), PCHAN_HAS_CONST = (1<<1), /* only used for drawing Posemode, not stored in channel */ @@ -130,7 +130,7 @@ enum { } ePchan_ConstFlag; /* PoseChannel->ikflag */ -enum { +typedef enum ePchan_IkFlag { BONE_IK_NO_XDOF = (1<<0), BONE_IK_NO_YDOF = (1<<1), BONE_IK_NO_ZDOF = (1<<2), @@ -145,7 +145,7 @@ enum { } ePchan_IkFlag; /* PoseChannel->rotmode */ -enum { +typedef enum ePchan_RotMode { /* quaternion rotations (default, and for older Blender versions) */ PCHAN_ROT_QUAT = 0, /* euler rotations (xyz only) */ @@ -177,7 +177,7 @@ typedef struct bPose { /* Pose->flag */ -enum { +typedef enum ePose_Flags { /* results in armature_rebuild_pose being called */ POSE_RECALC = (1<<0), /* prevents any channel from getting overridden by anim from IPO */ @@ -221,7 +221,7 @@ typedef struct bActionGroup { } bActionGroup; /* Action Group flags */ -enum { +typedef enum eActionGroup_Flag { AGRP_SELECTED = (1<<0), AGRP_ACTIVE = (1<<1), AGRP_PROTECTED = (1<<2), @@ -259,7 +259,7 @@ typedef struct bAction { /* Flags for the action */ -enum { +typedef enum eAction_Flags { /* flags for displaying in UI */ ACT_EXPANDED = (1<<0), ACT_SELECTED = (1<<1), @@ -331,7 +331,7 @@ typedef struct SpaceAction { } SpaceAction; /* SpaceAction flag */ -enum { +typedef enum eSAction_Flag { /* during transform (only set for TimeSlide) */ SACTION_MOVING = (1<<0), /* show sliders (if relevant) */ @@ -354,7 +354,7 @@ enum { /* SpaceAction Mode Settings */ // XXX should this be used by other editors too? -enum { +typedef enum eAnimEdit_Context { /* action (default) */ SACTCONT_ACTION = 0, /* editing of shapekey's IPO block */ @@ -366,7 +366,7 @@ enum { } eAnimEdit_Context; /* SpaceAction AutoSnap Settings (also used by other Animation Editors) */ -enum { +typedef enum eAnimEdit_AutoSnap { /* no auto-snap */ SACTSNAP_OFF = 0, /* snap to 1.0 frame/second intervals */ diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 43dada97d0e..48432b8c6e2 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -82,7 +82,7 @@ typedef struct bEditObjectActuator { char name[32]; float linVelocity[3]; /* initial lin. velocity on creation */ float angVelocity[3]; /* initial ang. velocity on creation */ - float pad; + float mass; short localflag; /* flag for the lin & ang. vel: apply locally */ short dyn_operation; } bEditObjectActuator; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index aeb5fe01533..9194e4d2632 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -312,6 +312,10 @@ typedef struct RenderData { /* cineon */ short cineonwhite, cineonblack; float cineongamma; + + /* jpeg2000 */ + short jp2_preset, jp2_depth; + int rpad3; } RenderData; /* control render convert and shading engine */ @@ -693,6 +697,7 @@ typedef struct Scene { #define R_DPX 27 #define R_MULTILAYER 28 #define R_DDS 29 +#define R_JP2 30 /* subimtype, flag options for imtype */ #define R_OPENEXR_HALF 1 @@ -701,6 +706,13 @@ typedef struct Scene { #define R_CINEON_LOG 8 #define R_TIFF_16BIT 16 +#define R_JPEG2K_12BIT 32 /* Jpeg2000 */ +#define R_JPEG2K_16BIT 64 +#define R_JPEG2K_YCC 128 /* when disabled use RGB */ +#define R_JPEG2K_CINE_PRESET 256 +#define R_JPEG2K_CINE_48FPS 512 + + /* bake_mode: same as RE_BAKE_xxx defines */ /* bake_flag: */ #define R_BAKE_CLEAR 1 |