[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47167] trunk/blender/source/blender: more plugin removal
Campbell Barton
ideasman42 at gmail.com
Tue May 29 12:41:01 CEST 2012
Revision: 47167
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47167
Author: campbellbarton
Date: 2012-05-29 10:41:00 +0000 (Tue, 29 May 2012)
Log Message:
-----------
more plugin removal
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2012-05-29 10:34:16 UTC (rev 47166)
+++ trunk/blender/source/blender/editors/interface/resources.c 2012-05-29 10:41:00 UTC (rev 47167)
@@ -1245,7 +1245,6 @@
vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight) : NULL);
if (bmain->versionfile <= 191) {
- BLI_strncpy(U.plugtexdir, U.textudir, sizeof(U.plugtexdir));
strcpy(U.sounddir, "/");
}
Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-05-29 10:34:16 UTC (rev 47166)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-05-29 10:41:00 UTC (rev 47167)
@@ -101,28 +101,6 @@
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 @@
float effect_fader;
float speed_fader;
- PluginSeq *plugin;
-
/* pointers for effects: */
struct Sequence *seq1, *seq2, *seq3;
Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h 2012-05-29 10:34:16 UTC (rev 47166)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h 2012-05-29 10:41:00 UTC (rev 47167)
@@ -44,7 +44,6 @@
struct AnimData;
struct Ipo;
-struct PluginTex;
struct ColorBand;
struct EnvMap;
struct Object;
@@ -104,30 +103,6 @@
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 @@
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;
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-05-29 10:34:16 UTC (rev 47166)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-05-29 10:41:00 UTC (rev 47167)
@@ -237,7 +237,7 @@
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 @@
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 */
More information about the Bf-blender-cvs
mailing list