diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:11:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:40:27 +0300 |
| commit | 44517c5f2177d1f260ba691fb59fbacfef576915 (patch) | |
| tree | 94d8cefa0a86c2a3de8eae236979d292ddb9d175 /intern/cycles/blender/blender_sync.h | |
| parent | 258292abc0252360e19654db454c7ef8bd2b63fe (diff) | |
| parent | 212a8d9e5ae78a30ed4c35161d91eeca35eaa41f (diff) | |
Merge commit '212a8d9e5ae7' into blender2.8
Considerable non-trivial merge conflict fixes.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 544836f0979..88f7ea7975c 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -134,6 +134,7 @@ private: int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object& b_ob, BL::Object& b_ob_instance, + int random_id, Transform& tfm, bool *use_portal); void sync_background_light(bool use_portal); |