[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14263] trunk/blender: baking normals could crash in rare cases because the intersection data wasn 't copied when the lambda was bigger then the previous or initialized.

[Campbell Barton]

Revision: 14263
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14263
Author:   campbellbarton
Date:     2008-03-27 17:28:21 +0100 (Thu, 27 Mar 2008)

Log Message:
-----------
baking normals could crash in rare cases because the intersection data wasn't copied when the lambda was bigger then the previous or initialized.

python baking script had a simple error.

Modified Paths:
--------------
    trunk/blender/release/scripts/bpymodules/BPyRender.py
    trunk/blender/source/blender/render/intern/source/raytrace.c

Modified: trunk/blender/release/scripts/bpymodules/BPyRender.py
===================================================================
--- trunk/blender/release/scripts/bpymodules/BPyRender.py	2008-03-27 11:52:58 UTC (rev 14262)
+++ trunk/blender/release/scripts/bpymodules/BPyRender.py	2008-03-27 16:28:21 UTC (rev 14263)
@@ -531,7 +531,7 @@
 	# New bake settings
 	rend.bakeClear = True
 	rend.bakeMargin = margin
-	BACKUP_bakeToActive = True
+	rend.bakeToActivefind  = True
 	
 	# Assume a mesh
 	me_from = ob_from.getData(mesh=1)

Modified: trunk/blender/source/blender/render/intern/source/raytrace.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/raytrace.c	2008-03-27 11:52:58 UTC (rev 14262)
+++ trunk/blender/source/blender/render/intern/source/raytrace.c	2008-03-27 16:28:21 UTC (rev 14263)
@@ -1033,8 +1033,11 @@
 						isect.ob= ob;
 						isect.face= face;
 						if(RE_ray_face_intersection(&isect, oc->transformfunc, oc->coordsfunc)) {
-							if(isect.labda<is->labda) *is= isect;
-							found= 1;
+							if(isect.labda<is->labda) {
+								*is= isect;
+								found= 1;
+							}
+							
 						}
 					}
 					//else rejected++;