Revision: 22740
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22740
Author: campbellbarton
Date: 2009-08-24 12:16:39 +0200 (Mon, 24 Aug 2009)
Log Message:
-----------
[#19029] Baking selected to active with nearby dupliframes objects crashes
blender
from Jorge Hodge (watcom)
Confirmed the crash. baking didn't account for RE_RAY_TRANSFORM_OFFS in
R.objectinstance.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/rendercore.c
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c
2009-08-24 10:07:49 UTC (rev 22739)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c
2009-08-24 10:16:39 UTC (rev 22740)
@@ -2241,7 +2241,7 @@
/* no direction checking for now, doesn't always improve the result
* (INPR(shi->facenor, bs->dir) > 0.0f); */
- return (R.objectinstance[ob].obr->ob != bs->actob);
+ return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob !=
bs->actob);
}
static int bake_intersect_tree(RayTree* raytree, Isect* isect, float *start,
float *dir, float sign, float *hitco, float *dist)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
