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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-19 18:32:32 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-19 18:32:32 +0400
commit54abd775d33ef35a217bb26413341c67fc638fed (patch)
tree9f17dd08e4cb6074c4cc9827087ad90418452204 /source/blender/nodes
parent652ea9ee303143a1bf5a457d1842c0878e36932f (diff)
Fix #19604: defocus node was not using camera object yet. Could use
a proper fix, but for now this makes things work again.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_defocus.c3
1 files changed, 2 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 b9a4f4c0cc5..0b0df4634a0 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
@@ -253,7 +253,8 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf,
// get some required params from the current scene camera
// (ton) this is wrong, needs fixed
- Object* camob = NULL; // XXX G.scene->camera;
+ Scene *scene= (Scene*)node->id;
+ Object* camob = (scene)? scene->camera: NULL;
if (camob && camob->type==OB_CAMERA) {
Camera* cam = (Camera*)camob->data;
cam_lens = cam->lens;