[Bf-blender-cvs] [3e6c734] master: Fix T40457: Subsurf modifier with Freestyle edges

[Sergey Sharybin]

Commit: 3e6c734eaa3ed3a12dccc84a3c39ecda050ccb37
Author: Sergey Sharybin
Date:   Mon Jun 2 14:24:25 2014 +0600
https://developer.blender.org/rB3e6c734eaa3ed3a12dccc84a3c39ecda050ccb37

Fix T40457: Subsurf modifier with Freestyle edges

You can't use ORIG index as an index to copy CD from source DM.

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

M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index a9eba54..7d9ba16 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -3780,8 +3780,9 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 		}
 
 		if (has_edge_cd) {
+			BLI_assert(edgeIdx >= 0 && edgeIdx < dm->getNumEdges(dm));
 			for (i = 0; i < numFinalEdges; ++i) {
-				CustomData_copy_data(&dm->edgeData, &ccgdm->dm.edgeData, mapIndex, edgeNum + i, 1);
+				CustomData_copy_data(&dm->edgeData, &ccgdm->dm.edgeData, edgeIdx, edgeNum + i, 1);
 			}
 		}