diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 15:44:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 15:44:03 +0300 |
| commit | 74051111eb2b0a0453d497018c48b0f33cfa8db7 (patch) | |
| tree | 2f1052489d4f4e7a1e3ac1ceb6e9389672440d5d /intern/cycles/render/camera.cpp | |
| parent | 160cb9a28477ccd1d8bdbf5265464dfdbea09d2c (diff) | |
| parent | b763c34e80d3b20f9a7f0a592e479e5fa7ab295f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/camera.cpp')
| -rw-r--r-- | intern/cycles/render/camera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index 38936ffc094..734cdffd5c5 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -176,7 +176,7 @@ Camera::Camera() need_flags_update = true; previous_need_motion = -1; - memset(&kernel_camera, 0, sizeof(kernel_camera)); + memset((void *)&kernel_camera, 0, sizeof(kernel_camera)); } Camera::~Camera() |