archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Camera: change default f-stop from 5.6 to 2.8

Browse Source 
This gives a more noticeable effect by default. Also fixes startup.blend not
having focus distance initialized correctly.
This commit is contained in:
Brecht Van Lommel
2019-05-20 16:14:02 +02:00
parent d2e139e44e
commit 49efb7bdbe
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -2240,13 +2240,13 @@ class VIEW3D_MT_object_context_menu(Menu):
props.input_scale = 0.01
props.header_text = "Camera Lens Scale: %.3f"
if not obj.data.dof_object:
if not obj.data.dof.focus_object:
if view and view.camera == obj and view.region_3d.view_perspective == 'CAMERA':
props = layout.operator("ui.eyedropper_depth", text="DOF Distance (Pick)")
else:
props = layout.operator("wm.context_modal_mouse", text="DOF Distance")
props.data_path_iter = "selected_editable_objects"
props.data_path_item = "data.dof_distance"
props.data_path_item = "data.dof.focus_distance"
props.input_scale = 0.02
props.header_text = "DOF Distance: %.3f"

2
source/blender/blenkernel/intern/camera.c
View File

@@ -66,7 +66,7 @@ void BKE_camera_init(Camera *cam)
cam->flag |= CAM_SHOWPASSEPARTOUT;
cam->passepartalpha = 0.5f;
cam->dof.aperture_fstop = 5.6f;
cam->dof.aperture_fstop = 2.8f;
cam->dof.aperture_ratio = 1.0f;
cam->dof.focus_distance = 10.0f;

2
source/blender/blenloader/intern/versioning_cycles.c
View File

@@ -523,7 +523,7 @@ void do_versions_after_linking_cycles(Main *bmain)
}
/* No depth of field, set default settings. */
camera->dof.aperture_fstop = 5.6f;
camera->dof.aperture_fstop = 2.8f;
camera->dof.aperture_blades = 0;
camera->dof.aperture_rotation = 0.0f;
camera->dof.aperture_ratio = 1.0f;

7
source/blender/blenloader/intern/versioning_defaults.c
View File

@@ -26,6 +26,7 @@
#include "BLI_string.h"
#include "BLI_system.h"
#include "DNA_camera_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
@@ -406,6 +407,12 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
/* Match default for new meshes. */
mesh->smoothresh = DEG2RADF(30);
}
for (Camera *camera = bmain->cameras.first; camera; camera = camera->id.next) {
/* Initialize to a useful value. */
camera->dof.focus_distance = 10.0f;
camera->dof.aperture_fstop = 2.8f;
}
}
for (bScreen *sc = bmain->screens.first; sc; sc = sc->id.next) {