Few small things:
authorAndrea Weikert <elubie@gmx.net>
Tue, 8 Dec 2009 00:57:14 +0000 (00:57 +0000)
committerAndrea Weikert <elubie@gmx.net>
Tue, 8 Dec 2009 00:57:14 +0000 (00:57 +0000)
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.

projectfiles_vc9/blender/editors/ED_editors.vcproj
release/scripts/ui/space_info.py
release/scripts/ui/space_sequencer.py
source/blender/makesrna/intern/rna_sequence.c

index fec46871e8300294bf8a94d9272647c5907d99bb..bd8e00461d73cb2e948f3c91acd754d2de66ea41 100644 (file)
                                RelativePath="..\..\..\source\blender\editors\space_graph\graph_edit.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\source\blender\editors\space_graph\graph_header.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h"\r
                                >\r
                                RelativePath="..\..\..\source\blender\editors\space_action\action_edit.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\source\blender\editors\space_action\action_header.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\space_action\action_intern.h"\r
                                >\r
                                RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\space_nla\nla_intern.h"\r
                                >\r
index ad94bdd0beba4485740ece040102ae21ed143500..c3b8a5151c7f90f7df9df7bc1ae7cef8c63a4a25 100644 (file)
@@ -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...")
index b2bd017262fd0b7be4a8cb348cfa2d0484973476..bb6bd1dc04c8c65466a6bf22dfd2d503f1f1df3d 100644 (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="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')
 
index 2e31facfd19d1330bff846be7c437427b4b0a912..cb9863d7ea595fb73856f7bf2e84163a6e6c8315 100644 (file)
@@ -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", ""},