diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-23 22:27:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-23 22:27:01 +0400 |
| commit | 0096d180b924c1f1187d723a8e79ddc1b4c83586 (patch) | |
| tree | 80aca065e503ae70b15c50c5d003e4d11246b521 /source/blender/nodes | |
| parent | ba6a09f31d3fff40d316d856795345d085d79a0f (diff) | |
Dof Object - set the depth of field to an object - set in the camera edit panel but the distance is calculated on the camera object only so linked cameras work.
Alt+Period - sets active pivot
some tooltips didnt make much sense, edited a few.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_defocus.c | 3 | ||||
| -rw-r--r-- | source/blender/nodes/intern/CMP_util.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c index 1eecbf3b63e..ee68b81cde8 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c @@ -257,7 +257,8 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf, if (camob && camob->type==OB_CAMERA) { Camera* cam = (Camera*)camob->data; cam_lens = cam->lens; - cam_fdist = (cam->YF_dofdist==0.f) ? 1e10f : cam->YF_dofdist; + cam_fdist = dof_camera(camob); + if (cam_fdist==0.0) cam_fdist = 1e10f; /* if the dof is 0.0 then set it be be far away */ cam_invfdist = 1.f/cam_fdist; } diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 515980bc563..83f85160625 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -60,6 +60,7 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" #include "BKE_library.h" +#include "BKE_object.h" #include "../CMP_node.h" #include "node_util.h" |