blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T47608: Cycles cage baking crash after recent uv derivative fixes.

This commit is contained in:
Brecht Van Lommel 2016-02-27 23:51:25 +01:00 committed by Sergey Sharybin
parent 42fd804cca
commit 77f96266e8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/intern/source/bake_api.c
View File

@ -543,6 +543,7 @@ bool RE_bake_pixels_populate_from_objects(
for (i = 0; i < num_pixels; i++) {
float co[3];
float dir[3];
TriTessFace *tri_low;
primitive_id = pixel_array_from[i].primitive_id;
@ -557,16 +558,19 @@ bool RE_bake_pixels_populate_from_objects(
/* calculate from low poly mesh cage */
if (is_custom_cage) {
calc_point_from_barycentric_cage(tris_low, tris_cage, mat_low, mat_cage, primitive_id, u, v, co, dir);
tri_low = &tris_cage[primitive_id];
}
else if (is_cage) {
calc_point_from_barycentric_extrusion(tris_cage, mat_low, imat_low, primitive_id, u, v, cage_extrusion, co, dir, true);
tri_low = &tris_cage[primitive_id];
}
else {
calc_point_from_barycentric_extrusion(tris_low, mat_low, imat_low, primitive_id, u, v, cage_extrusion, co, dir, false);
tri_low = &tris_cage[primitive_id];
}
/* cast ray */
if (!cast_ray_highpoly(treeData, &tris_low[primitive_id], tris_high,
if (!cast_ray_highpoly(treeData, tri_low, tris_high,
pixel_array_from, pixel_array_to, mat_low,
highpoly, co, dir, i, tot_highpoly)) {
/* if it fails mask out the original pixel array */