[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45041] trunk/blender: patch from Richard Shaw, exclude ffmpeg files when its disabled.

Campbell Barton ideasman42 at gmail.com
Tue Mar 20 23:00:34 CET 2012


Revision: 45041
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45041
Author:   campbellbarton
Date:     2012-03-20 22:00:21 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
patch from Richard Shaw, exclude ffmpeg files when its disabled.

also fix for incorrect text in mesh specials menu - Select Inverse was called (De)Select All.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/blenkernel/CMakeLists.txt

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-03-20 20:37:40 UTC (rev 45040)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-03-20 22:00:21 UTC (rev 45041)
@@ -1605,7 +1605,7 @@
         layout.operator("mesh.dissolve_limited")
         layout.operator("mesh.hide", text="Hide")
         layout.operator("mesh.reveal", text="Reveal")
-        layout.operator("mesh.select_all").action = 'INVERT'
+        layout.operator("mesh.select_all", text="Select Inverse").action = 'INVERT'
         layout.operator("mesh.flip_normals")
         layout.operator("mesh.vertices_smooth", text="Smooth")
         layout.operator("mesh.bevel", text="Bevel")

Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt	2012-03-20 20:37:40 UTC (rev 45040)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt	2012-03-20 22:00:21 UTC (rev 45041)
@@ -144,7 +144,6 @@
 	intern/unit.c
 	intern/world.c
 	intern/writeavi.c
-	intern/writeffmpeg.c
 	intern/writeframeserver.c
 	
 	BKE_DerivedMesh.h
@@ -230,7 +229,6 @@
 	BKE_utildefines.h
 	BKE_world.h
 	BKE_writeavi.h
-	BKE_writeffmpeg.h
 	BKE_writeframeserver.h
 	depsgraph_private.h
 	nla_private.h
@@ -299,6 +297,10 @@
 endif()
 
 if(WITH_CODEC_FFMPEG)
+	list(APPEND SRC
+		intern/writeffmpeg.c
+		BKE_writeffmpeg.h
+	)
 	list(APPEND INC
 		../../../intern/ffmpeg
 	)




More information about the Bf-blender-cvs mailing list