diff options
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_util.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index c7d37527d78..aea63b6b31f 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -90,7 +90,7 @@ struct BlenderCamera { static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings& b_render) { - memset(bcam, 0, sizeof(BlenderCamera)); + memset((void *)bcam, 0, sizeof(BlenderCamera)); bcam->type = CAMERA_PERSPECTIVE; bcam->zoom = 1.0f; diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 8a874b7063e..e9ede91c295 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -251,7 +251,7 @@ static inline Transform get_transform(const BL::Array<float, 16>& array) /* We assume both types to be just 16 floats, and transpose because blender * use column major matrix order while we use row major. */ - memcpy(&projection, &array, sizeof(float)*16); + memcpy((void *)&projection, &array, sizeof(float)*16); projection = projection_transpose(projection); /* Drop last row, matrix is assumed to be affine transform. */ |