Merged changes in the trunk up to revision 32886.

2010-11-05 21:49:36 +00:00
parent aa7575c008 e8501edae2
commit 43f4dbceb4
552 changed files with 14432 additions and 21005 deletions
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -764,9 +764,14 @@ class RENDER_PT_antialiasing(RenderButtonsPanel, bpy.types.Panel):


 class RENDER_PT_motion_blur(RenderButtonsPanel, bpy.types.Panel):
-    bl_label = "Full Sample Motion Blur"
+    bl_label = "Sampled Motion Blur"
    bl_options = {'DEFAULT_CLOSED'}
    COMPAT_ENGINES = {'BLENDER_RENDER'}
+	
+    @classmethod
+    def poll(cls, context):
+        rd = context.scene.render
+        return not rd.use_full_sample and (rd.engine in cls.COMPAT_ENGINES)

    def draw_header(self, context):
        rd = context.scene.render