[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25196] trunk/blender: Few small things:

[Andrea Weikert]

Revision: 25196
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25196
Author:   elubie
Date:     2009-12-08 01:57:14 +0100 (Tue, 08 Dec 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/makesrna/intern/rna_sequence.c

Modified: trunk/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-12-07 23:47:37 UTC (rev 25195)
+++ trunk/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-12-08 00:57:14 UTC (rev 25196)
@@ -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>

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2009-12-07 23:47:37 UTC (rev 25195)
+++ trunk/blender/release/scripts/ui/space_info.py	2009-12-08 00:57:14 UTC (rev 25196)
@@ -79,7 +79,7 @@
 
         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...")

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2009-12-07 23:47:37 UTC (rev 25195)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2009-12-08 00:57:14 UTC (rev 25196)
@@ -178,6 +178,7 @@
         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 @@
             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')
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequence.c	2009-12-07 23:47:37 UTC (rev 25195)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequence.c	2009-12-08 00:57:14 UTC (rev 25196)
@@ -396,7 +396,6 @@
 		{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", ""},