diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 19:02:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 19:02:21 +0400 |
commit | 7d04e4c53e5cd4888afd4177a9d70a6fc72c8e36 (patch) | |
tree | 9877850d4e9b86a36f787f2f730668617b42a1b4 /source/blender/makesdna | |
parent | ec4f6750557218be262cacea53ef4cb0ccaa0671 (diff) | |
parent | feb3dc926a74b51789b100ac9532dc196a4cd9ae (diff) |
svn merge ^/trunk/blender -r47150:47184
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 26 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 28 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 |
3 files changed, 3 insertions, 55 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index cd73b692011..b4dc40a81c3 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -101,28 +101,6 @@ typedef struct Strip { StripColorBalance *color_balance; } Strip; - -typedef struct PluginSeq { - char name[1024]; /* 1024 = FILE_MAX */ - void *handle; - - char *pname; - - int vars, version; - - void *varstr; - float *cfra; - - float data[32]; - - void *instance_private_data; - void **current_private_data; - - void (*doit)(void); - - void (*callback)(void); -} PluginSeq; - /* The sequence structure is the basic struct used by any strip. each of the strips uses a different sequence structure.*/ /* WATCH IT: first part identical to ID (for use in ipo's) */ @@ -158,8 +136,6 @@ typedef struct Sequence { float effect_fader; float speed_fader; - PluginSeq *plugin; - /* pointers for effects: */ struct Sequence *seq1, *seq2, *seq3; @@ -339,7 +315,7 @@ typedef struct SpeedControlVars { #define SEQ_GAMCROSS 13 #define SEQ_MUL 14 #define SEQ_OVERDROP 15 -#define SEQ_PLUGIN 24 +// #define SEQ_PLUGIN 24 /* Deprecated */ #define SEQ_WIPE 25 #define SEQ_GLOW 26 #define SEQ_TRANSFORM 27 diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 7497f5e7449..606c466ac74 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -44,7 +44,6 @@ extern "C" { struct AnimData; struct Ipo; -struct PluginTex; struct ColorBand; struct EnvMap; struct Object; @@ -104,30 +103,6 @@ typedef struct MTex { typedef unsigned short dna_ushort_fix; #endif -typedef struct PluginTex { - char name[1024]; - void *handle; - - char *pname; - char *stnames; - - int stypes; - int vars; - void *varstr; - float *result; - float *cfra; - - float data[32]; - - int (*doit)(void); - void (*instance_init)(void *); - - /* should be void (*)(unsigned short)... patched */ - void (*callback)(dna_ushort_fix); - - int version, pad; -} PluginTex; - typedef struct CBData { float r, g, b, a, pos; int cur; @@ -267,7 +242,6 @@ typedef struct Tex { struct bNodeTree *nodetree; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Image *ima; - struct PluginTex *plugin; struct ColorBand *coba; struct EnvMap *env; struct PreviewImage * preview; @@ -324,7 +298,7 @@ typedef struct ColorMapping { #define TEX_STUCCI 6 #define TEX_NOISE 7 #define TEX_IMAGE 8 -#define TEX_PLUGIN 9 +//#define TEX_PLUGIN 9 /* Deprecated */ #define TEX_ENVMAP 10 #define TEX_MUSGRAVE 11 #define TEX_VORONOI 12 diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index b0874eefa4a..be2268aa492 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -237,7 +237,7 @@ typedef struct ThemeSpace { char syntaxv[4], syntaxc[4]; char movie[4], movieclip[4], image[4], scene[4], audio[4]; // for sequence editor - char effect[4], plugin[4], transition[4], meta[4]; + char effect[4], hpad0[4], transition[4], meta[4]; char editmesh_active[4]; char handle_vertex[4]; @@ -334,8 +334,6 @@ typedef struct UserDef { char fontdir[768]; char renderdir[1024]; /* FILE_MAX length */ char textudir[768]; - char plugtexdir[768]; - char plugseqdir[768]; char pythondir[768]; char sounddir[768]; char image_editor[1024]; /* 1024 = FILE_MAX */ |