Pre-merger changes.soc-2008-mxcurioni

Deprecated Freestyle-specific elements were removed from the code base,
in order to address all comments from branch code reviews.
https://codereview.appspot.com/7416049/

Backward compatibility won't be maintained in the following components:

- Freestyle edge/face marks in old .blend files are ignored.

Old .blend files can be converted by loading and saving the files using
a Freestyle branch build between revision 55581 and 55842.

- External style modules are no longer supported.

Instead text datablocks must be used to keep style module files within
.blend files.  A branch build between revision 55741 and 55842 is useful
for identifying the style module file names that need reconfiguring.

1 files changed, 0 insertions, 21 deletions

diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index e957b4e4572..9cdd52f2375 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -374,27 +374,6 @@ static DerivedMesh *applyModifier(
 	DM_copy_poly_data(dm, result, 0, 0, numFaces);
 	DM_copy_poly_data(dm, result, 0, numFaces, numFaces);
 
-#if 1 /* WITH_FREESTYLE generic changes */
-	/* When the input DM has no edge CD_ORIGINDEX layer (i.e., the corresponding
-	 * layer of the result DM is filled with zeros; see CDDM_from_template()),
-	 * set the layer to an identity mapping */
-	if (!CustomData_has_layer(&dm->edgeData, CD_ORIGINDEX)) {
-		int *index = DM_get_edge_data_layer(result, CD_ORIGINDEX);
-		range_vn_i(index, numEdges, 0);
-		range_vn_i(index+numEdges, numEdges, 0);
-	}
-	/* Do the same for poly CD_ORIGINDEX layer */
-	if (!CustomData_has_layer(&dm->polyData, CD_ORIGINDEX)) {
-		int *index, a;
-		DM_add_poly_layer(result, CD_ORIGINDEX, CD_CALLOC, NULL);
-		index = DM_get_poly_data_layer(result, CD_ORIGINDEX);
-		range_vn_i(index, numFaces, 0);
-		range_vn_i(index+numFaces, numFaces, 0);
-		for (a = 0; a < newFaces; a++)
-			index[numFaces*2+a] = ORIGINDEX_NONE;
-	}
-#endif
-
 	/* if the original has it, get the result so we can update it */
 	face_nors_result = CustomData_get_layer(&result->polyData, CD_NORMAL);