[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32813] trunk/blender: "Fix" for [#22537] motion blur render result incorrect when full sample anti-aliasing is selected

[Janne Karhu]

Revision: 32813
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32813
Author:   jhk
Date:     2010-11-01 14:51:11 +0100 (Mon, 01 Nov 2010)

Log Message:
-----------
"Fix" for [#22537] motion blur render result incorrect when full sample anti-aliasing is selected
* FSA and motion blur can't work nicely together the way they're currently implemented, so I disabled this in the ui and code.
* FSA is used if both are selected.
* Also changed the name "Full Sample Motion Blur" to "Sampled Motion Blur" to avoid confusion with full sample anti-aliasing.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_render.py
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2010-11-01 13:27:33 UTC (rev 32812)
+++ trunk/blender/release/scripts/ui/properties_render.py	2010-11-01 13:51:11 UTC (rev 32813)
@@ -483,9 +483,14 @@
 
 
 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
 
     def draw_header(self, context):
         rd = context.scene.render

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-11-01 13:27:33 UTC (rev 32812)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-11-01 13:51:11 UTC (rev 32813)
@@ -1965,7 +1965,7 @@
 	
 	/* first field, we have to call camera routine for correct aspect and subpixel offset */
 	RE_SetCamera(re, re->scene->camera);
-	if(re->r.mode & R_MBLUR)
+	if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
 		do_render_blur_3d(re);
 	else
 		do_render_3d(re);
@@ -1985,7 +1985,7 @@
 			re->field_offs = 0.5f;
 		}
 		RE_SetCamera(re, re->scene->camera);
-		if(re->r.mode & R_MBLUR)
+		if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
 			do_render_blur_3d(re);
 		else
 			do_render_3d(re);
@@ -2075,7 +2075,7 @@
 	
 	if(re->r.mode & R_FIELDS)
 		do_render_fields_3d(re);
-	else if(re->r.mode & R_MBLUR)
+	else if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
 		do_render_blur_3d(re);
 	else
 		do_render_3d(re);