[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46017] trunk/blender: Plugin system:
Thomas Dinges
blender at dingto.org
Sat Apr 28 10:27:14 CEST 2012
Revision: 46017
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46017
Author: dingto
Date: 2012-04-28 08:27:09 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Plugin system:
* Remove RNA, Operator and UI for Texture and Sequence plugins.
Since 2.5x no effort has been done to bring that back, so there is simply no reason in keeping that code and the UI for that ;-)
* Low Level code still exists and is unchanged.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_ui.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-04-28 08:27:09 UTC (rev 46017)
@@ -220,7 +220,6 @@
layout.operator("sequencer.effect_strip_add", text="Gamma Cross").type = 'GAMMA_CROSS'
layout.operator("sequencer.effect_strip_add", text="Multiply").type = 'MULTIPLY'
layout.operator("sequencer.effect_strip_add", text="Over Drop").type = 'OVER_DROP'
- layout.operator("sequencer.effect_strip_add", text="Plugin").type = 'PLUGIN'
layout.operator("sequencer.effect_strip_add", text="Wipe").type = 'WIPE'
layout.operator("sequencer.effect_strip_add", text="Glow").type = 'GLOW'
layout.operator("sequencer.effect_strip_add", text="Transform").type = 'TRANSFORM'
@@ -488,7 +487,7 @@
col = layout.column(align=True)
if strip.type == 'SPEED':
col.prop(strip, "multiply_speed")
- elif strip.type in {'CROSS', 'GAMMA_CROSS', 'PLUGIN', 'WIPE'}:
+ elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE'}:
col.prop(strip, "use_default_fade", "Default fade")
if not strip.use_default_fade:
col.prop(strip, "effect_fader", text="Effect fader")
@@ -553,7 +552,6 @@
return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'META',
'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
- 'PLUGIN',
'WIPE', 'GLOW', 'TRANSFORM',
'MULTICAM', 'SPEED', 'ADJUSTMENT'}
@@ -716,7 +714,6 @@
return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'META',
'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
- 'PLUGIN',
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
'MULTICAM', 'SPEED', 'ADJUSTMENT'}
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2012-04-28 08:27:09 UTC (rev 46017)
@@ -797,8 +797,6 @@
sub = col1.column()
sub.prop(paths, "font_directory", text="")
sub.prop(paths, "texture_directory", text="")
- sub.prop(paths, "texture_plugin_directory", text="")
- sub.prop(paths, "sequence_plugin_directory", text="")
sub.prop(paths, "render_output_directory", text="")
sub.prop(paths, "script_directory", text="")
sub.prop(paths, "sound_directory", text="")
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -87,7 +87,6 @@
{SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"},
{SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"},
{SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"},
- {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", "Plugin effect strip type"},
{SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"},
{SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"},
{SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"},
Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -1451,22 +1451,6 @@
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Scene", "Scene to be added/removed/paused/resumed");
RNA_def_property_update(prop, NC_LOGIC, NULL);
-
- /* XXX no need for those tooltips. to remove soon
- * Originally we had different 'scene' tooltips for different values of 'type'.
- * They were:
- * ACT_SCENE_RESTART ""
- * ACT_SCENE_CAMERA ""
- * ACT_SCENE_SET "Set this Scene"
- * ACT_SCENE_ADD_FRONT "Add an Overlay Scene"
- * ACT_SCENE_ADD_BACK "Add a Background Scene"
- * ACT_SCENE_REMOVE "Remove a Scene"
- * ACT_SCENE_SUSPEND "Pause a Scene"
- * ACT_SCENE_RESUME "Unpause a Scene"
- *
- * It can be done in the ui script if still needed.
- */
-
}
static void rna_def_random_actuator(BlenderRNA *brna)
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -414,8 +414,6 @@
return &RNA_MulticamSequence;
case SEQ_ADJUSTMENT:
return &RNA_AdjustmentSequence;
- case SEQ_PLUGIN:
- return &RNA_PluginSequence;
case SEQ_WIPE:
return &RNA_WipeSequence;
case SEQ_GLOW:
@@ -1588,25 +1586,6 @@
rna_def_input(srna);
}
-static void rna_def_plugin(BlenderRNA *brna)
-{
- StructRNA *srna;
- PropertyRNA *prop;
-
- srna = RNA_def_struct(brna, "PluginSequence", "EffectSequence");
- RNA_def_struct_ui_text(srna, "Plugin Sequence",
- "Sequence strip applying an effect, loaded from an external plugin");
- RNA_def_struct_sdna_from(srna, "PluginSeq", "plugin");
-
- prop = RNA_def_property(srna, "filename", PROP_STRING, PROP_FILENAME);
- RNA_def_property_string_sdna(prop, NULL, "name");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Filename", "");
- RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");
-
- /* plugin properties need custom wrapping code like ID properties */
-}
-
static void rna_def_wipe(BlenderRNA *brna)
{
StructRNA *srna;
@@ -1848,7 +1827,6 @@
rna_def_effect(brna);
rna_def_multicam(brna);
rna_def_adjustment(brna);
- rna_def_plugin(brna);
rna_def_wipe(brna);
rna_def_glow(brna);
rna_def_transform(brna);
Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -134,8 +134,6 @@
return &RNA_MusgraveTexture;
case TEX_NOISE:
return &RNA_NoiseTexture;
- case TEX_PLUGIN:
- return &RNA_PluginTexture;
case TEX_POINTDENSITY:
return &RNA_PointDensityTexture;
case TEX_STUCCI:
@@ -1302,17 +1300,6 @@
RNA_def_property_update(prop, 0, "rna_Texture_update");
}
-static void rna_def_texture_plugin(BlenderRNA *brna)
-{
- StructRNA *srna;
-
- srna = RNA_def_struct(brna, "PluginTexture", "Texture");
- RNA_def_struct_ui_text(srna, "Plugin", "External plugin texture");
- RNA_def_struct_sdna(srna, "Tex");
-
- /* XXX: todo */
-}
-
static void rna_def_texture_environment_map(BlenderRNA *brna)
{
StructRNA *srna;
@@ -2013,7 +2000,6 @@
rna_def_texture_stucci(brna);
rna_def_texture_noise(brna);
rna_def_texture_image(brna);
- rna_def_texture_plugin(brna);
rna_def_texture_environment_map(brna);
rna_def_texture_musgrave(brna);
rna_def_texture_voronoi(brna);
Modified: trunk/blender/source/blender/makesrna/intern/rna_ui.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -723,7 +723,7 @@
prop = RNA_def_property(srna, "bl_context", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "type->context");
- RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); /* should this be optional? - Campbell */
+ RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); /* Only used in Properties Editor and 3D View - Thomas */
RNA_def_property_ui_text(prop, "Context",
"The context in which the panel belongs to. (TODO: explain the "
"possible combinations bl_context/bl_region_type/bl_space_type)");
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-04-28 07:43:21 UTC (rev 46016)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-04-28 08:27:09 UTC (rev 46017)
@@ -1769,12 +1769,6 @@
RNA_def_property_ui_text(prop, "Effect Strip", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
- prop = RNA_def_property(srna, "plugin_strip", PROP_FLOAT, PROP_COLOR_GAMMA);
- RNA_def_property_float_sdna(prop, NULL, "plugin");
- RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Plugin Strip", "");
- RNA_def_property_update(prop, 0, "rna_userdef_update");
-
prop = RNA_def_property(srna, "transition_strip", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "transition");
RNA_def_property_array(prop, 3);
@@ -3373,15 +3367,6 @@
RNA_def_property_string_sdna(prop, NULL, "textudir");
RNA_def_property_ui_text(prop, "Textures Directory", "The default directory to search for textures");
- prop = RNA_def_property(srna, "texture_plugin_directory", PROP_STRING, PROP_DIRPATH);
- RNA_def_property_string_sdna(prop, NULL, "plugtexdir");
- RNA_def_property_ui_text(prop, "Texture Plugin Directory", "The default directory to search for texture plugins");
-
- prop = RNA_def_property(srna, "sequence_plugin_directory", PROP_STRING, PROP_DIRPATH);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list