griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#33394] Skin modifier doesn't show generated skin mesh in EditMode with Texured Solid draw option

Browse Source
This commit is contained in:
Campbell Barton
2012-12-03 09:08:53 +00:00
parent 1523fe0e11
commit 3ec39706b4
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -653,12 +653,26 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
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 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
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);
}
}