diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
| commit | cdc31c3e6e953b8e10c757db113b7a60f701e1dd (patch) | |
| tree | 6bb85293faf6b7ab7ad7e8d169106584590fbc94 /intern/cycles/blender/blender_sync.cpp | |
| parent | 49d51a1e6246f00233abf54a8b24b5d829848e44 (diff) | |
| parent | 40dbf2fc0000f2905d436fc28b93a9b97431f72d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index f3312e2909f..870183aa1d6 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -225,9 +225,7 @@ void BlenderSync::sync_data(BL::RenderSettings& b_render, void BlenderSync::sync_integrator() { -#ifdef __CAMERA_MOTION__ BL::RenderSettings r = b_scene.render(); -#endif PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); experimental = (get_enum(cscene, "feature_set") != 0); @@ -272,7 +270,6 @@ void BlenderSync::sync_integrator() integrator->sample_clamp_direct = get_float(cscene, "sample_clamp_direct"); integrator->sample_clamp_indirect = get_float(cscene, "sample_clamp_indirect"); -#ifdef __CAMERA_MOTION__ if(!preview) { if(integrator->motion_blur != r.use_motion_blur()) { scene->object_manager->tag_update(scene); @@ -281,7 +278,6 @@ void BlenderSync::sync_integrator() integrator->motion_blur = r.use_motion_blur(); } -#endif integrator->method = (Integrator::Method)get_enum(cscene, "progressive", |