Few small things:

1. MSVC 9 projectfiles update (graph_header.c, action_header.c and nla_header.c removed)

2. Fix for opening the filebrowser when saving file for the first time (untitled.blend) from file menu

3. Add CROSS effect sequence type back to menu. (Durian fix)
Note: Removed SEQ_EFFECT from rna, since this no actual sequence type, but rather used to check for the effect bit.
This commit is contained in:
Andrea Weikert 2009-12-08 00:57:14 +00:00
parent 742a09858b
commit d653b0c961
4 changed files with 3 additions and 15 deletions

View File

@ -631,10 +631,6 @@
RelativePath="..\..\..\source\blender\editors\space_graph\graph_edit.c" RelativePath="..\..\..\source\blender\editors\space_graph\graph_edit.c"
> >
</File> </File>
<File
RelativePath="..\..\..\source\blender\editors\space_graph\graph_header.c"
>
</File>
<File <File
RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h" RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h"
> >
@ -835,10 +831,6 @@
RelativePath="..\..\..\source\blender\editors\space_action\action_edit.c" RelativePath="..\..\..\source\blender\editors\space_action\action_edit.c"
> >
</File> </File>
<File
RelativePath="..\..\..\source\blender\editors\space_action\action_header.c"
>
</File>
<File <File
RelativePath="..\..\..\source\blender\editors\space_action\action_intern.h" RelativePath="..\..\..\source\blender\editors\space_action\action_intern.h"
> >
@ -875,10 +867,6 @@
RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c" RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c"
> >
</File> </File>
<File
RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"
>
</File>
<File <File
RelativePath="..\..\..\source\blender\editors\space_nla\nla_intern.h" RelativePath="..\..\..\source\blender\editors\space_nla\nla_intern.h"
> >

View File

@ -79,7 +79,7 @@ class INFO_MT_file(bpy.types.Menu):
layout.separator() 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("wm.save_mainfile", text="Save", icon='ICON_FILE_TICK')
layout.operator_context = 'INVOKE_AREA' layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_as_mainfile", text="Save As...") layout.operator("wm.save_as_mainfile", text="Save As...")

View File

@ -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="Subtract").type = 'SUBTRACT'
layout.operator("sequencer.effect_strip_add", text="Alpha Over").type = 'ALPHA_OVER' 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="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="Gamma Cross").type = 'GAMMA_CROSS'
layout.operator("sequencer.effect_strip_add", text="Multiply").type = 'MULTIPLY' 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="Over Drop").type = 'OVER_DROP'
@ -338,7 +339,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel):
return False return False
return strip.type in ('ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', return strip.type in ('ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
'PLUGIN', 'PLUGIN',
'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED') 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')

View File

@ -396,7 +396,6 @@ static void rna_def_sequence(BlenderRNA *brna)
{SEQ_SCENE, "SCENE", 0, "Scene", ""}, {SEQ_SCENE, "SCENE", 0, "Scene", ""},
{SEQ_MOVIE, "MOVIE", 0, "Movie", ""}, {SEQ_MOVIE, "MOVIE", 0, "Movie", ""},
{SEQ_SOUND, "SOUND", 0, "Sound", ""}, {SEQ_SOUND, "SOUND", 0, "Sound", ""},
{SEQ_EFFECT, "REPLACE", 0, "Replace", ""},
{SEQ_CROSS, "CROSS", 0, "Cross", ""}, {SEQ_CROSS, "CROSS", 0, "Cross", ""},
{SEQ_ADD, "ADD", 0, "Add", ""}, {SEQ_ADD, "ADD", 0, "Add", ""},
{SEQ_SUB, "SUBTRACT", 0, "Subtract", ""}, {SEQ_SUB, "SUBTRACT", 0, "Subtract", ""},