diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-10 01:25:53 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-10 01:27:07 +0300 |
| commit | ba9992aa9182286404d94e651abdc91d5d7b36f7 (patch) | |
| tree | 8e8122a5b3cbe3966afab6d955c42fb680d98ce1 /intern/cycles/blender/blender_camera.cpp | |
| parent | fb82cff7208fa5e612e54cf9fdb36859602e1ca0 (diff) | |
Cycles: Cleanp, avoid direct calls of RNA_enum_get, we've got utility for that
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index fc977991dfc..6928fe471a3 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -156,10 +156,9 @@ static void blender_camera_from_object(BlenderCamera *bcam, default: bcam->type = CAMERA_PERSPECTIVE; break; - } + } - switch(RNA_enum_get(&ccamera, "panorama_type")) - { + switch(get_enum(ccamera, "panorama_type")) { case 1: bcam->panorama_type = PANORAMA_FISHEYE_EQUIDISTANT; break; @@ -188,7 +187,7 @@ static void blender_camera_from_object(BlenderCamera *bcam, /* allow f/stop number to change aperture_size but still * give manual control over aperture radius */ - int aperture_type = RNA_enum_get(&ccamera, "aperture_type"); + int aperture_type = get_enum(ccamera, "aperture_type"); if(aperture_type == 1) { float fstop = RNA_float_get(&ccamera, "aperture_fstop"); @@ -461,7 +460,7 @@ void BlenderSync::sync_camera(BL::RenderSettings& b_render, curvemapping_to_array(b_shutter_curve, bcam.shutter_curve, RAMP_TABLE_SIZE); PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); - switch(RNA_enum_get(&cscene, "motion_blur_position")) { + switch(get_enum(cscene, "motion_blur_position")) { case 0: bcam.motion_position = Camera::MOTION_POSITION_START; break; @@ -476,7 +475,7 @@ void BlenderSync::sync_camera(BL::RenderSettings& b_render, break; } - switch(RNA_enum_get(&cscene, "rolling_shutter_type")) { + switch(get_enum(cscene, "rolling_shutter_type")) { case 0: bcam.rolling_shutter_type = Camera::ROLLING_SHUTTER_NONE; break; |