diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 09:07:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 09:07:59 +0300 |
| commit | cb8afaf5db9de16965dbb693cbd43cf767d5e7ed (patch) | |
| tree | 3f753af9a9c6e124140c5e0c04460f4879288937 /intern/cycles/blender/blender_sync.cpp | |
| parent | 0f17425d6e8457dcd85e318910192d4c53a3dd68 (diff) | |
| parent | 6e253fc627462ff230ea003a8bd0e5e4dc6cc74e (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index b023183217e..fd45bac645d 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -780,7 +780,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, } } } - } RNA_END + } RNA_END; if(used_devices.size() == 1) { params.device = used_devices[0]; |