diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-11 11:14:16 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-11 11:14:16 +0300 |
| commit | dc95c79971d48dae9418e0047f14c01e6dcab13c (patch) | |
| tree | f6da183a7e7b3d0adf691c5b270ccab4f8801e35 /intern/cycles/blender/blender_sync.h | |
| parent | ef1918d3128b1f56d69c189a838b648dc88de4c9 (diff) | |
| parent | 4782000fd5b2a1ae3041884f64ab192dbcb853c0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 69fee9551dd..544836f0979 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -56,8 +56,7 @@ public: BL::Scene& b_scene, Scene *scene, bool preview, - Progress &progress, - bool is_cpu); + Progress &progress); ~BlenderSync(); /* sync */ @@ -85,8 +84,7 @@ public: /* get parameters */ static SceneParams get_scene_params(BL::Scene& b_scene, - bool background, - bool is_cpu); + bool background); static SessionParams get_session_params(BL::RenderEngine& b_engine, BL::UserPreferences& b_userpref, BL::Scene& b_scene, @@ -182,7 +180,6 @@ private: Scene *scene; bool preview; bool experimental; - bool is_cpu; float dicing_rate; int max_subdivisions; |