diff options
| -rw-r--r-- | SConstruct | 36 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 2 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
8 files changed, 3 insertions, 64 deletions
diff --git a/SConstruct b/SConstruct index bbf3dff0394..cf88a4b9b7d 100644 --- a/SConstruct +++ b/SConstruct @@ -667,42 +667,6 @@ if env['OURPLATFORM']=='linuxcross': scriptinstall.append(env.Install(dir=dir, source=source)) -#-- plugins -pluglist = [] -plugtargetlist = [] -for tp, tn, tf in os.walk('release/plugins'): - if '.svn' in tn: - tn.remove('.svn') - if '_svn' in tn: - tn.remove('_svn') - df = tp[8:] # remove 'release/' - for f in tf: - pluglist.append(os.path.join(tp, f)) - plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) ) - - -# header files for plugins -pluglist.append('source/blender/blenpluginapi/documentation.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h')) -pluglist.append('source/blender/blenpluginapi/externdef.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h')) -pluglist.append('source/blender/blenpluginapi/floatpatch.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h')) -pluglist.append('source/blender/blenpluginapi/iff.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h')) -pluglist.append('source/blender/blenpluginapi/plugin.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h')) -pluglist.append('source/blender/blenpluginapi/util.h') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h')) -pluglist.append('source/blender/blenpluginapi/plugin.DEF') -plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def')) - -plugininstall = [] -# plugins in blender 2.5 don't work at the moment. -#for targetdir,srcfile in zip(plugtargetlist, pluglist): -# td, tf = os.path.split(targetdir) -# plugininstall.append(env.Install(dir=td, source=srcfile)) - textlist = [] texttargetlist = [] for tp, tn, tf in os.walk('release/text'): diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index cea041eb294..4b6c362cd85 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -57,7 +57,6 @@ #include "RNA_access.h" /* **** XXX **** */ -static void error(const char *UNUSED(error), ...) {} /* Glow effect */ enum { diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 3664d7bcd77..74f5e7fc2bd 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -54,13 +54,11 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check); #define BLENDER_USER_CONFIG 31 #define BLENDER_USER_DATAFILES 32 #define BLENDER_USER_SCRIPTS 33 -#define BLENDER_USER_PLUGINS 34 -#define BLENDER_USER_AUTOSAVE 35 +#define BLENDER_USER_AUTOSAVE 34 /* system */ #define BLENDER_SYSTEM_DATAFILES 52 #define BLENDER_SYSTEM_SCRIPTS 53 -#define BLENDER_SYSTEM_PLUGINS 54 #define BLENDER_SYSTEM_PYTHON 54 /* for BLI_get_folder_version only */ diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index d79f0a3bf2c..1a68d3c1f09 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -416,8 +416,6 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *col, flo /** * * \attention defined in readimage.c - * \deprecated Only here for backwards compatibility of the - * \deprecated plugin system. */ struct ImBuf *IMB_loadifffile(int file, int flags, const char *descr); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 8632c663b01..9082bb42be5 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1374,7 +1374,7 @@ static void rna_def_effect_inputs(StructRNA *srna, int count) } /* - if (count == 3) { // not used by any effects ...except maybe plugins? + if (count == 3) { // not used by any effects (perhaps one day plugins?) prop = RNA_def_property(srna, "input_3", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "seq3"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index cfccd92ef86..674d5540c8b 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -101,8 +101,7 @@ endif() bf_rna bf_bmesh bf_blenkernel - bf_blenloader - bf_blenpluginapi + bf_blenloader ge_blen_routines bf_editor_datafiles ge_converter diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 02d19398a7a..74ccda8ce0e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -395,14 +395,6 @@ if(UNIX AND NOT APPLE) ) endif() - # plugins in blender 2.6 don't work at the moment. - # - # install( - # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - # DESTINATION ${TARGETDIR_VER} - # PATTERN ".svn" EXCLUDE - # ) - if(WITH_PYTHON) if(WITH_PYTHON_INSTALL) # on some platforms (like openSUSE) Python is linked @@ -482,14 +474,6 @@ elseif(WIN32) endif() endif() - # plugins in blender 2.6 don't work at the moment. - # - # install( - # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - # DESTINATION ${TARGETDIR_VER} - # PATTERN ".svn" EXCLUDE - # ) - if(WITH_PYTHON) set_lib_path(PYLIB "python/lib") install( @@ -857,7 +841,6 @@ endif() bf_blenlib bf_intern_ghost bf_intern_string - bf_blenpluginapi bf_avi bf_imbuf_cineon bf_imbuf_openexr diff --git a/source/creator/creator.c b/source/creator/creator.c index 4294ddc8feb..0cdbeb940b8 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -261,7 +261,6 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) BLI_argsPrintArgDoc(ba, "--env-system-config"); BLI_argsPrintArgDoc(ba, "--env-system-datafiles"); BLI_argsPrintArgDoc(ba, "--env-system-scripts"); - BLI_argsPrintArgDoc(ba, "--env-system-plugins"); BLI_argsPrintArgDoc(ba, "--env-system-python"); printf("\n"); BLI_argsPrintArgDoc(ba, "-nojoystick"); @@ -1136,7 +1135,6 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) /* TODO, add user env vars? */ BLI_argsAdd(ba, 1, NULL, "--env-system-datafiles", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_DATAFILES)" environment variable", set_env, NULL); BLI_argsAdd(ba, 1, NULL, "--env-system-scripts", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_SCRIPTS)" environment variable", set_env, NULL); - BLI_argsAdd(ba, 1, NULL, "--env-system-plugins", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PLUGINS)" environment variable", set_env, NULL); BLI_argsAdd(ba, 1, NULL, "--env-system-python", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PYTHON)" environment variable", set_env, NULL); /* second pass: custom window stuff */ |