[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23962] trunk/blender/source/blender: Fix #19604: defocus node was not using camera object yet.

[Brecht Van Lommel]

Revision: 23962
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23962
Author:   blendix
Date:     2009-10-19 16:32:32 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
Fix #19604: defocus node was not using camera object yet. Could use
a proper fix, but for now this makes things work again.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2009-10-19 14:15:53 UTC (rev 23961)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-10-19 14:32:32 UTC (rev 23962)
@@ -4119,7 +4119,7 @@
 	bNode *node;
 	
 	for(node= ntree->nodes.first; node; node= node->next)
-		if(node->id==NULL && ELEM(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE))
+		if(node->id==NULL && ELEM3(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS))
 			node->id= &scene->id;
 }
 

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2009-10-19 14:15:53 UTC (rev 23961)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2009-10-19 14:32:32 UTC (rev 23962)
@@ -253,7 +253,8 @@
 	
 	// 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;