Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-05-29 14:21:07 +0400
committerThomas Dinges <blender@dingto.org>2012-05-29 14:21:07 +0400
commit16117143d8f12dac65caa8368f56a7e8af8f0db2 (patch)
tree365d68a11bc4a898a863bf8c229d8cda629d9dc7 /source/blender/editors
parentdf8880a81f5ba212c49c357294774119c16fd13e (diff)
Massive Code cleanup:
* Remove all code for Texture and Sequencer plugin system, this never worked in 2.5x / 2.6x and is therefore not needed anymore. * DNA structures are kept, all read/writefile code is gone.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/include/UI_resources.h1
-rw-r--r--source/blender/editors/interface/resources.c4
-rw-r--r--source/blender/editors/space_sequencer/sequencer_add.c24
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c20
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c21
5 files changed, 3 insertions, 67 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 2d409879ba3..852adc58762 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -154,7 +154,6 @@ enum {
TH_SEQ_SCENE,
TH_SEQ_AUDIO,
TH_SEQ_EFFECT,
- TH_SEQ_PLUGIN,
TH_SEQ_TRANSITION,
TH_SEQ_META,
TH_SEQ_PREVIEW,
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index edad33953b9..b1f353b2808 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -378,8 +378,6 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
cp = ts->audio; break;
case TH_SEQ_EFFECT:
cp = ts->effect; break;
- case TH_SEQ_PLUGIN:
- cp = ts->plugin; break;
case TH_SEQ_TRANSITION:
cp = ts->transition; break;
case TH_SEQ_META:
@@ -775,7 +773,6 @@ void ui_theme_init_default(void)
rgba_char_args_set(btheme->tseq.scene, 78, 152, 62, 255);
rgba_char_args_set(btheme->tseq.audio, 46, 143, 143, 255);
rgba_char_args_set(btheme->tseq.effect, 169, 84, 124, 255);
- rgba_char_args_set(btheme->tseq.plugin, 126, 126, 80, 255);
rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
rgba_char_args_set(btheme->tseq.meta, 109, 145, 131, 255);
rgba_char_args_set(btheme->tseq.preview_back, 0, 0, 0, 255);
@@ -1369,7 +1366,6 @@ void init_userdef_do_versions(void)
rgba_char_args_set(btheme->tseq.scene, 78, 152, 62, 255);
rgba_char_args_set(btheme->tseq.audio, 46, 143, 143, 255);
rgba_char_args_set(btheme->tseq.effect, 169, 84, 124, 255);
- rgba_char_args_set(btheme->tseq.plugin, 126, 126, 80, 255);
rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
rgba_char_args_set(btheme->tseq.meta, 109, 145, 131, 255);
}
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 3861e2670f1..9eb4c62789e 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -740,20 +740,7 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
seq->strip = strip = MEM_callocN(sizeof(Strip), "strip");
strip->us = 1;
- if (seq->type == SEQ_PLUGIN) {
- char path[FILE_MAX];
- RNA_string_get(op->ptr, "filepath", path);
-
- sh.init_plugin(seq, path);
-
- if (seq->plugin == NULL) {
- BLI_remlink(ed->seqbasep, seq);
- seq_free_sequence(scene, seq);
- BKE_reportf(op->reports, RPT_ERROR, "Sequencer plugin \"%s\" could not load", path);
- return OPERATOR_CANCELLED;
- }
- }
- else if (seq->type == SEQ_COLOR) {
+ if (seq->type == SEQ_COLOR) {
SolidColorVars *colvars = (SolidColorVars *)seq->effectdata;
RNA_float_get_array(op->ptr, "color", colvars->col);
seq->blend_mode = SEQ_CROSS; /* so alpha adjustment fade to the strip below */
@@ -824,14 +811,7 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven
sequencer_generic_invoke_xy__internal(C, op, event, prop_flag);
- if (is_type_set && type == SEQ_PLUGIN) {
- /* only plugins need the file selector */
- WM_event_add_fileselect(C, op);
- return OPERATOR_RUNNING_MODAL;
- }
- else {
- return sequencer_add_effect_strip_exec(C, op);
- }
+ return sequencer_add_effect_strip_exec(C, op);
}
void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 392e7793a0f..236baea01be 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -153,10 +153,6 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[
col[0] = col[1] = col[2] = 128;
}
break;
-
- case SEQ_PLUGIN:
- UI_GetThemeColor3ubv(TH_SEQ_PLUGIN, col);
- break;
case SEQ_SOUND:
UI_GetThemeColor3ubv(TH_SEQ_AUDIO, col);
@@ -563,22 +559,8 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
}
else if (seq->type & SEQ_EFFECT) {
- int can_float = (seq->type != SEQ_PLUGIN) || (seq->plugin && seq->plugin->version >= 4);
-
- if (seq->seq3 != seq->seq2 && seq->seq1 != seq->seq3) {
- BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d (use %d)%s",
- seq->len, name, seq->seq1->machine, seq->seq2->machine, seq->seq3->machine,
- can_float ? "" : " No float, upgrade plugin!");
- }
- else if (seq->seq1 && seq->seq2) {
- BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d%s",
- seq->len, name, seq->seq1->machine, seq->seq2->machine,
- can_float ? "" : " No float, upgrade plugin!");
- }
- else {
- BLI_snprintf(str, sizeof(str), "%d | %s",
+ BLI_snprintf(str, sizeof(str), "%d | %s",
seq->len, name);
- }
}
else if (seq->type == SEQ_SOUND) {
if (seq->sound)
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 778bddb545a..072cfa00622 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -231,27 +231,6 @@ void seq_rectf(Sequence *seq, rctf *rectf)
rectf->ymax = seq->machine + SEQ_STRIP_OFSTOP;
}
-static void UNUSED_FUNCTION(change_plugin_seq) (Scene * scene, char *str) /* called from fileselect */
-{
- Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
- struct SeqEffectHandle sh;
- Sequence *last_seq = BKE_sequencer_active_get(scene);
-
- if (last_seq == NULL || last_seq->type != SEQ_PLUGIN) return;
-
- sh = get_sequence_effect(last_seq);
- sh.free(last_seq);
- sh.init_plugin(last_seq, str);
-
- last_seq->machine = MAX3(last_seq->seq1->machine,
- last_seq->seq2->machine,
- last_seq->seq3->machine);
-
- if (seq_test_overlap(ed->seqbasep, last_seq) ) shuffle_seq(ed->seqbasep, last_seq, scene);
-
-}
-
-
void boundbox_seq(Scene *scene, rctf *rect)
{
Sequence *seq;