[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52736] trunk/blender/source/blender/ blenkernel/intern/cdderivedmesh.c: fix [#33394] Skin modifier doesn' t show generated skin mesh in EditMode with Texured Solid draw option

[Campbell Barton]

Revision: 52736
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52736
Author:   campbellbarton
Date:     2012-12-03 09:08:53 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
fix [#33394] Skin modifier doesn't show generated skin mesh in EditMode with Texured Solid draw option

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-12-03 08:37:43 UTC (rev 52735)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-12-03 09:08:53 UTC (rev 52736)
@@ -653,12 +653,26 @@
 			else {
 				if (index_mf_to_mpoly) {
 					orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, i);
-					if (orig == ORIGINDEX_NONE) { if (nors) nors += 3; continue; }
-					if (drawParamsMapped)       { draw_option = drawParamsMapped(userData, orig); }
-					else                        { if (nors) nors += 3; continue; }
+					if (orig == ORIGINDEX_NONE) {
+						draw_option = DM_DRAW_OPTION_NORMAL;
+					}
+					else if (drawParamsMapped) {
+						draw_option = drawParamsMapped(userData, orig);
+					}
+					else {
+						if (nors) {
+							nors += 3; continue;
+						}
+					}
 				}
-				else if (drawParamsMapped) { draw_option = drawParamsMapped(userData, i); }
-				else                       { if (nors) nors += 3; continue; }
+				else if (drawParamsMapped) {
+					draw_option = drawParamsMapped(userData, i);
+				}
+				else {
+					if (nors) {
+						nors += 3; continue;
+					}
+				}
 			}
 			
 			if (draw_option != DM_DRAW_OPTION_SKIP) {
@@ -742,9 +756,9 @@
 					if (index_mf_to_mpoly) {
 						orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, actualFace);
 						if (orig == ORIGINDEX_NONE) {
-							continue;
+							draw_option = DM_DRAW_OPTION_NORMAL;
 						}
-						if (drawParamsMapped) {
+						else if (drawParamsMapped) {
 							draw_option = drawParamsMapped(userData, orig);
 						}
 					}