[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53459] trunk/blender: Fix #33706: issue in cycles motion blur rendering after hair commit, my fault

[Brecht Van Lommel]

Revision: 53459
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53459
Author:   blendix
Date:     2012-12-31 13:07:06 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Fix #33706: issue in cycles motion blur rendering after hair commit, my fault
for not finding it in review.

Also removed the hard limits on motion blur shutter time, soft limits are still
the same but it can be useful to set things lower/higher in some cases.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_shader.h
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-12-31 12:26:14 UTC (rev 53458)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-12-31 13:07:06 UTC (rev 53459)
@@ -60,6 +60,8 @@
 	sd->object = (isect->object == ~0)? kernel_tex_fetch(__prim_object, isect->prim): isect->object;
 #endif
 
+	sd->flag = kernel_tex_fetch(__object_flag, sd->object);
+
 	/* matrices and time */
 #ifdef __OBJECT_MOTION__
 	shader_setup_object_transforms(kg, sd, ray->time);
@@ -121,8 +123,7 @@
 
 	sd->I = -ray->D;
 
-	sd->flag = kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2);
-	sd->flag |= kernel_tex_fetch(__object_flag, sd->object);
+	sd->flag |= kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2);
 
 #ifdef __INSTANCING__
 	if(isect->object != ~0) {

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-12-31 12:26:14 UTC (rev 53458)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-12-31 13:07:06 UTC (rev 53459)
@@ -3694,10 +3694,9 @@
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");
 	
-	prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_UNSIGNED);
 	RNA_def_property_float_sdna(prop, NULL, "blurfac");
-	RNA_def_property_range(prop, 0.01f, 10.0f);
-	RNA_def_property_ui_range(prop, 0.01, 2.0f, 1, 0);
+	RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 0);
 	RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");