From 2d0d4e7de4d31bd2f8485a9b7b4311bf8e254c3d Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sun, 1 Nov 2009 00:06:53 +0000 Subject: commit before doing some hefty shapekey change, will break compilation --- source/blender/makesdna/DNA_customdata_types.h | 6 +++++- source/blender/makesdna/DNA_fileglobal_types.h | 3 +++ source/blender/makesdna/DNA_key_types.h | 6 ++++-- source/blender/makesdna/DNA_mesh_types.h | 2 ++ source/blender/makesdna/DNA_modifier_types.h | 5 +++++ source/blender/makesdna/DNA_object_types.h | 1 + source/blender/makesdna/DNA_scene_types.h | 3 ++- source/blender/makesdna/DNA_screen_types.h | 1 + source/blender/makesdna/DNA_space_types.h | 8 +++++--- source/blender/makesdna/DNA_text_types.h | 4 ++-- source/blender/makesdna/DNA_windowmanager_types.h | 5 +++-- 11 files changed, 33 insertions(+), 11 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index e4a16da0365..dbaa6f40cbf 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -82,7 +82,9 @@ typedef struct CustomData { #define CD_WEIGHT_MLOOPCOL 23 #define CD_ID_MCOL 24 #define CD_TEXTURE_MCOL 25 -#define CD_NUMTYPES 26 +#define CD_SHAPE_KEYINDEX 26 +#define CD_SHAPEKEY 27 +#define CD_NUMTYPES 28 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -109,6 +111,8 @@ typedef struct CustomData { #define CD_MASK_MPOLY (1 << CD_MPOLY) #define CD_MASK_MLOOP (1 << CD_MLOOP) #define CD_MASK_WEIGHT_MLOOPCOL (1 << CD_WEIGHT_MLOOPCOL) +#define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX) +#define CD_MASK_SHAPEKEY (1 << CD_SHAPEKEY) /* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ #define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index 43ab895b398..271c8d2a33e 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -47,6 +47,9 @@ typedef struct FileGlobal { struct Scene *curscene; int fileflags; int globalf; + + /* file path where this was saved, for recover */ + char filename[240]; /* 240 = FILE_MAX */ } FileGlobal; diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index c42e555d562..e86abf12424 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -80,6 +80,7 @@ typedef struct Key { #define KEY_RELATIVE 1 /* key->flag */ +#define KEY_DS_EXPAND 1 /* keyblock->type */ #define KEY_LINEAR 0 @@ -87,8 +88,9 @@ typedef struct Key { #define KEY_BSPLINE 2 /* keyblock->flag */ -#define KEYBLOCK_MUTE 1 -#define KEYBLOCK_DS_EXPAND 2 +#define KEYBLOCK_MUTE (1<<0) +#define KEYBLOCK_SEL (1<<1) +#define KEYBLOCK_LOCKED (1<<2) #endif diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index c9b12f0e147..688ee9a2cea 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -138,6 +138,8 @@ typedef struct TFace { #define ME_EDIT_MIRROR_Y (1 << 1) // unused so far #define ME_EDIT_MIRROR_Z (1 << 2) // unused so far +#define ME_EDIT_PAINT_MASK (1 << 3) + /* me->flag */ #define ME_ISDONE 1 #define ME_NOPUNOFLIP 2 diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 7c76a5c099d..db1c261556b 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -63,6 +63,7 @@ typedef enum ModifierType { eModifierType_Multires, eModifierType_Surface, eModifierType_Smoke, + eModifierType_ShapeKey, NUM_MODIFIER_TYPES } ModifierType; @@ -663,4 +664,8 @@ typedef struct SimpleDeformModifierData { #define MOD_UVPROJECT_MAX 10 +typedef struct ShapeKeyModifierData { + ModifierData modifier; +} ShapeKeyModifierData; + #endif diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e7f8594d00e..693621ab711 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -500,6 +500,7 @@ extern Object workob; /* ob->shapeflag */ #define OB_SHAPE_LOCK 1 #define OB_SHAPE_TEMPLOCK 2 // deprecated +#define OB_SHAPE_EDIT_MODE 4 /* ob->nlaflag */ // XXX depreceated - old animation system diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 91f8e8d5c41..f14f7b58bef 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -556,7 +556,7 @@ typedef struct VPaint { #define VP_SOFT 4 #define VP_NORMALS 8 #define VP_SPRAY 16 -#define VP_MIRROR_X 32 +// #define VP_MIRROR_X 32 // depricated in 2.5x use (me->editflag & ME_EDIT_MIRROR_X) #define VP_HARD 64 #define VP_ONLYVGROUP 128 @@ -1169,6 +1169,7 @@ typedef enum SculptFlags { #define SK_RETARGET_AUTONAME 1 /* toolsettings->skgen_retarget_roll */ +#define SK_RETARGET_ROLL_NONE 0 #define SK_RETARGET_ROLL_VIEW 1 #define SK_RETARGET_ROLL_JOINT 2 diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index e51da0c0818..b091a0529e7 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -106,6 +106,7 @@ typedef struct Panel { /* the part from uiBlock that needs saved in file */ void *activedata; /* runtime for panel manipulation */ int list_scroll, list_size; + int list_last_len, list_grip_size; char list_search[64]; } Panel; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index d7793b88bea..3a61902e119 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -86,7 +86,6 @@ typedef struct SpaceInfo { } SpaceInfo; /* 'Graph' Editor (formerly known as the IPO Editor) */ -/* XXX for now, we keep all old data... */ typedef struct SpaceIpo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ @@ -101,9 +100,11 @@ typedef struct SpaceIpo { ListBase ghostCurves; /* sampled snapshots of F-Curves used as in-session guides */ short mode; /* mode for the Graph editor (eGraphEdit_Mode) */ - short flag; /* settings for Graph editor */ short autosnap; /* time-transform autosnapping settings for Graph editor (eAnimEdit_AutoSnap in DNA_action_types.h) */ - char pin, lock; // XXX old, unused vars that are probably going to be depreceated soon... + int flag; /* settings for Graph editor */ + + float cursorVal; /* cursor value (y-value, x-value is current frame) */ + int around; /* pivot point for transforms */ } SpaceIpo; typedef struct SpaceButs { @@ -723,6 +724,7 @@ enum FileSortTypeE { #define SIPO_SELCUVERTSONLY (1<<5) #define SIPO_DRAWNAMES (1<<6) #define SIPO_SLIDERS (1<<7) +#define SIPO_NODRAWCURSOR (1<<8) /* SpaceIpo->mode (Graph Editor Mode) */ enum { diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h index 8f9d4b5f4b4..5793f061f06 100644 --- a/source/blender/makesdna/DNA_text_types.h +++ b/source/blender/makesdna/DNA_text_types.h @@ -70,8 +70,8 @@ typedef struct Text { double mtime; } Text; - -#define TXT_OFFSET 35 + /* TXT_OFFSET used to be 35 when the scrollbar was on the left... */ +#define TXT_OFFSET 15 #define TXT_TABSIZE 4 #define TXT_INIT_UNDO 1024 #define TXT_MAX_UNDO (TXT_INIT_UNDO*TXT_INIT_UNDO) diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 7a024e35ff0..5cdd74c8262 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -124,6 +124,9 @@ typedef struct wmWindowManager { ListBase keyconfigs; /* known key configurations */ struct wmKeyConfig *defaultconf; /* default configuration, not saved */ int defaultactmap, pad2; /* active keymap from default for editing */ + + ListBase timers; /* active timers */ + struct wmTimer *autosavetimer; /* timer for auto save */ } wmWindowManager; /* wmWindowManager.initialized */ @@ -160,8 +163,6 @@ typedef struct wmWindow { int drawmethod, drawfail; /* internal for wm_draw.c only */ void *drawdata; /* internal for wm_draw.c only */ - ListBase timers; - ListBase queue; /* all events (ghost level events were handled) */ ListBase handlers; /* window+screen handlers, handled last */ ListBase modalhandlers; /* priority handlers, handled first */ -- cgit v1.2.3