diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-04-11 23:49:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-12 00:12:11 +0300 |
| commit | ebfdd7da83200f2890b28dd5ef9a0fc8c6ab9137 (patch) | |
| tree | 8ccb1ad1af787ccf3d186b687324e4056f9665df /intern/cycles/blender/blender_camera.cpp | |
| parent | 7d033717ad52bf92235e65224b6b3940de7ec473 (diff) | |
Cycles microdisplacement: perform subdivision dicing in raster space
NOTE: this is only the first of many patches towards completing the subdivison
and displacement system in Cycles. These patches will be reviewed and committed
one by one over the coming weeks.
Reviewed By: brecht, sergey
Differential Revision: https://developer.blender.org/D1909
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 5bc9dfc7904..6b459ae575f 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -360,6 +360,12 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int blender_camera_viewplane(bcam, width, height, &cam->viewplane, &aspectratio, &sensor_size); + cam->width = bcam->full_width; + cam->height = bcam->full_height; + + cam->full_width = width; + cam->full_height = height; + /* panorama sensor */ if(bcam->type == CAMERA_PANORAMA && bcam->panorama_type == PANORAMA_FISHEYE_EQUISOLID) { float fit_xratio = (float)bcam->full_width*bcam->pixelaspect.x; |