griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Lukas Stockner
2025-10-13 01:08:43 +02:00
parent cf976a7e99 d458416f4d
commit c0bec1d068
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/camera.cpp
View File

@@ -234,7 +234,7 @@ static void blender_camera_from_object(BlenderCamera *bcam,
float fstop = b_camera.dof().aperture_fstop(); float fstop = b_camera.dof().aperture_fstop();
fstop = max(fstop, 1e-5f); fstop = max(fstop, 1e-5f);
if (bcam->type == CAMERA_ORTHOGRAPHIC) { if (bcam->type == CAMERA_ORTHOGRAPHIC || bcam->type == CAMERA_CUSTOM) {
bcam->aperturesize = 1.0f / (2.0f * fstop); bcam->aperturesize = 1.0f / (2.0f * fstop);
} }
else { else {

1
scripts/templates_osl/advanced_camera.osl
View File

@@ -68,6 +68,7 @@ shader camera(float focal_length = 50.0 [[ float min = 0.0, float sensitivity =
float focal_distance; float focal_distance;
getattribute("cam:focal_distance", focal_distance); getattribute("cam:focal_distance", focal_distance);
getattribute("cam:aperture_position", position); getattribute("cam:aperture_position", position);
position *= focal_length * 1e-3;
point Pfocus = direction * focal_distance / direction.z; point Pfocus = direction * focal_distance / direction.z;
direction = normalize(Pfocus - position); direction = normalize(Pfocus - position);

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

@@ -118,7 +118,7 @@ static void camera_foreach_id(ID *id, LibraryForeachIDData *data)
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, camera->dof_ob, IDWALK_CB_NOP); BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, camera->dof_ob, IDWALK_CB_NOP);
} }
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, camera->custom_shader, IDWALK_CB_NOP); BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, camera->custom_shader, IDWALK_CB_USER);
} }
static void camera_foreach_path(ID *id, BPathForeachPathData *bpath_data) static void camera_foreach_path(ID *id, BPathForeachPathData *bpath_data)