Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-20 17:14:02 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-20 17:35:34 +0300
commit49efb7bdbe5643f0a24f045419e5f280ad5f5734 (patch)
tree45f49ead8aa21fb8764b709c309d6e1ef892b38a /source
parentd2e139e44e0a3b70ae3b517c7b8f2449d3d1620c (diff)
Camera: change default f-stop from 5.6 to 2.8
This gives a more noticeable effect by default. Also fixes startup.blend not having focus distance initialized correctly.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/camera.c2
-rw-r--r--source/blender/blenloader/intern/versioning_cycles.c2
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c7
3 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index a17cbb29550..a8f38c3c4ce 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -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;
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c
index 93813df3c13..9bfbf4477ab 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -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;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 83a21a5480d..338d1d1ff90 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -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) {