[Bf-blender-cvs] [81f6431] master: Fix T46226: Bake normals multi-res crash

[Campbell Barton]

Commit: 81f64312d29260fded00da75ddb0f3da730585b0
Author: Campbell Barton
Date:   Thu Sep 24 20:14:51 2015 +1000
Branches: master
https://developer.blender.org/rB81f64312d29260fded00da75ddb0f3da730585b0

Fix T46226: Bake normals multi-res crash

===================================================================

M	source/blender/render/intern/source/multires_bake.c

===================================================================

diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index 0223f76..dcc33b9 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -612,7 +612,7 @@ static void get_ccgdm_data(DerivedMesh *lodm, DerivedMesh *hidm,
 		int col = cell_index % polys_per_grid_side;
 
 		/* S is the vertex whose grid we are examining */
-		S = loc_cage_poly_offs / (polys_per_grid_side * polys_per_grid_side);
+		S = poly_index / (1 << (2 * (lvl - 1))) - grid_offset[cage_face_index];
 		/* get offset of grid data for original cage face */
 		g_index = grid_offset[cage_face_index];