diff options
| -rw-r--r-- | projectfiles_vc9/blender/editors/ED_editors.vcproj | 12 | ||||
| -rw-r--r-- | release/scripts/ui/space_info.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_sequencer.py | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequence.c | 1 |
4 files changed, 3 insertions, 15 deletions
diff --git a/projectfiles_vc9/blender/editors/ED_editors.vcproj b/projectfiles_vc9/blender/editors/ED_editors.vcproj index fec46871e83..bd8e00461d7 100644 --- a/projectfiles_vc9/blender/editors/ED_editors.vcproj +++ b/projectfiles_vc9/blender/editors/ED_editors.vcproj @@ -632,10 +632,6 @@ >
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_graph\graph_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h"
>
</File>
@@ -836,10 +832,6 @@ >
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_action\action_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_action\action_intern.h"
>
</File>
@@ -876,10 +868,6 @@ >
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_nla\nla_intern.h"
>
</File>
diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index ad94bdd0beb..c3b8a5151c7 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -79,7 +79,7 @@ class INFO_MT_file(bpy.types.Menu): layout.separator() - layout.operator_context = 'EXEC_AREA' + layout.operator_context = 'INVOKE_AREA' layout.operator("wm.save_mainfile", text="Save", icon='ICON_FILE_TICK') layout.operator_context = 'INVOKE_AREA' layout.operator("wm.save_as_mainfile", text="Save As...") diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index b2bd017262f..bb6bd1dc04c 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -178,6 +178,7 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu): layout.operator("sequencer.effect_strip_add", text="Subtract").type = 'SUBTRACT' layout.operator("sequencer.effect_strip_add", text="Alpha Over").type = 'ALPHA_OVER' layout.operator("sequencer.effect_strip_add", text="Alpha Under").type = 'ALPHA_UNDER' + layout.operator("sequencer.effect_strip_add", text="Cross").type = 'CROSS' 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' @@ -338,7 +339,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel): return False return strip.type in ('ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', - 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', + 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'PLUGIN', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED') diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c index 2e31facfd19..cb9863d7ea5 100644 --- a/source/blender/makesrna/intern/rna_sequence.c +++ b/source/blender/makesrna/intern/rna_sequence.c @@ -396,7 +396,6 @@ static void rna_def_sequence(BlenderRNA *brna) {SEQ_SCENE, "SCENE", 0, "Scene", ""}, {SEQ_MOVIE, "MOVIE", 0, "Movie", ""}, {SEQ_SOUND, "SOUND", 0, "Sound", ""}, - {SEQ_EFFECT, "REPLACE", 0, "Replace", ""}, {SEQ_CROSS, "CROSS", 0, "Cross", ""}, {SEQ_ADD, "ADD", 0, "Add", ""}, {SEQ_SUB, "SUBTRACT", 0, "Subtract", ""}, |