Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.cpp
index 446c4893fc5265c3e2a1b4ccede45ece04d46155..62b9fa3c92b852c8fc947f6116387e767874755a 100644 (file)
@@ -247,8 +247,12 @@ void BlenderSync::sync_integrator()
        integrator->filter_glossy = get_float(cscene, "blur_glossy");
 
        integrator->seed = get_int(cscene, "seed");
-       if(get_boolean(cscene, "use_animated_seed"))
-               integrator->seed = hash_int_2d(b_scene.frame_current(), get_int(cscene, "seed"));
+       if(get_boolean(cscene, "use_animated_seed")) {
+               integrator->seed = hash_int_2d(b_scene.frame_current(),
+                                              get_int(cscene, "seed")) +
+                                  hash_int_2d((int)(b_scene.frame_subframe() * (float)INT_MAX),
+                                              get_int(cscene, "seed"));
+       }
 
        integrator->sampling_pattern = (SamplingPattern)get_enum(
                cscene,