[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54882] trunk/blender/source/blender: fix own regression since 2.65 [#34438] Solidify crease bug

[Campbell Barton]

Revision: 54882
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54882
Author:   campbellbarton
Date:     2013-02-26 14:32:53 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
fix own regression since 2.65 [#34438] Solidify crease bug

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
    trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-02-26 11:46:38 UTC (rev 54881)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-02-26 14:32:53 UTC (rev 54882)
@@ -491,7 +491,7 @@
 	CustomData_copy(&dm->edgeData, &tmp.edata, CD_MASK_MESH, CD_DUPLICATE, totedge);
 	CustomData_copy(&dm->loopData, &tmp.ldata, CD_MASK_MESH, CD_DUPLICATE, totloop);
 	CustomData_copy(&dm->polyData, &tmp.pdata, CD_MASK_MESH, CD_DUPLICATE, totpoly);
-	me->cd_flag = dm->cd_flag;
+	tmp.cd_flag = dm->cd_flag;
 
 	if (CustomData_has_layer(&dm->vertData, CD_SHAPEKEY)) {
 		KeyBlock *kb;

Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2013-02-26 11:46:38 UTC (rev 54881)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2013-02-26 14:32:53 UTC (rev 54882)
@@ -29,6 +29,7 @@
  *  \ingroup modifiers
  */
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -598,6 +599,10 @@
 		int *orig_ed;
 		int j;
 
+		if (crease_rim || crease_outer || crease_inner) {
+			result->cd_flag |= ME_CDFLAG_EDGE_CREASE;
+		}
+
 		/* add faces & edges */
 		origindex_edge = result->getEdgeDataArray(result, CD_ORIGINDEX);
 		ed = &medge[numEdges * 2];

Modified: trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c	2013-02-26 11:46:38 UTC (rev 54881)
+++ trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c	2013-02-26 14:32:53 UTC (rev 54882)
@@ -107,6 +107,7 @@
 		subsurf_flags |= SUBSURF_IN_EDIT_MODE;
 	
 	result = subsurf_make_derived_from_derived(derivedData, smd, NULL, subsurf_flags);
+	result->cd_flag = derivedData->cd_flag;
 	
 	if (useRenderParams || !isFinalCalc) {
 		DerivedMesh *cddm = CDDM_copy(result);