patch from Richard Shaw, exclude ffmpeg files when its disabled.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Mar 2012 22:00:21 +0000 (22:00 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Mar 2012 22:00:21 +0000 (22:00 +0000)
also fix for incorrect text in mesh specials menu - Select Inverse was called (De)Select All.

release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt

index 9867b68f36661248fdc610f520325f9b081eb2df..78a9482ab5e8d58a79f6dc49c9e9dab074e86e08 100644 (file)
@@ -1605,7 +1605,7 @@ class VIEW3D_MT_edit_mesh_specials(Menu):
         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")
index ce282e90ac1ee7c640d859122bc0cce70ebf0ae7..fe06ba1ad2c00bb3148869e37dd0ac2954a20015 100644 (file)
@@ -144,7 +144,6 @@ set(SRC
        intern/unit.c
        intern/world.c
        intern/writeavi.c
-       intern/writeffmpeg.c
        intern/writeframeserver.c
        
        BKE_DerivedMesh.h
@@ -230,7 +229,6 @@ set(SRC
        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 @@ if(WITH_CODEC_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
+       list(APPEND SRC
+               intern/writeffmpeg.c
+               BKE_writeffmpeg.h
+       )
        list(APPEND INC
                ../../../intern/ffmpeg
        )