diff options
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/camera.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/scene.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/svm.cpp | 2 |
3 files changed, 4 insertions, 4 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() diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index b35cdbd3db5..c0f1ae0445e 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -79,13 +79,13 @@ DeviceScene::DeviceScene(Device *device) sobol_directions(device, "__sobol_directions", MEM_TEXTURE), ies_lights(device, "__ies", MEM_TEXTURE) { - memset(&data, 0, sizeof(data)); + memset((void*)&data, 0, sizeof(data)); } Scene::Scene(const SceneParams& params_, Device *device) : device(device), dscene(device), params(params_) { - memset(&dscene.data, 0, sizeof(dscene.data)); + memset((void *)&dscene.data, 0, sizeof(dscene.data)); camera = new Camera(); dicing_camera = new Camera(); diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index eb8a35a271f..626f160786f 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -735,7 +735,7 @@ void SVMCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType ty } /* clear all compiler state */ - memset(&active_stack, 0, sizeof(active_stack)); + memset((void *)&active_stack, 0, sizeof(active_stack)); current_svm_nodes.clear(); foreach(ShaderNode *node_iter, graph->nodes) { |