[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47038] trunk/blender/source/blender/ modifiers/intern/MOD_solidify.c: fix for error in previous commit - missed flip when even edges were selected .
Campbell Barton
ideasman42 at gmail.com
Sat May 26 11:33:15 CEST 2012
Revision: 47038
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47038
Author: campbellbarton
Date: 2012-05-26 09:33:15 +0000 (Sat, 26 May 2012)
Log Message:
-----------
fix for error in previous commit - missed flip when even edges were selected.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c 2012-05-26 09:18:47 UTC (rev 47037)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c 2012-05-26 09:33:15 UTC (rev 47038)
@@ -423,7 +423,7 @@
if (ofs_new != 0.0f) {
scalar_short = scalar_short_vgroup = ofs_new / 32767.0f;
- mv = mvert + ((ofs_new >= ofs_orig) == do_flip ? numVerts : 0);
+ mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? numVerts : 0);
dv = dvert;
for (i = 0; i < numVerts; i++, mv++) {
if (dv) {
@@ -438,7 +438,7 @@
if (ofs_orig != 0.0f) {
scalar_short = scalar_short_vgroup = ofs_orig / 32767.0f;
- mv = mvert + ((ofs_new >= ofs_orig) == do_flip ? 0 : numVerts); /* as above but swapped, intentional use 'ofs_new' */
+ mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts); /* as above but swapped, intentional use 'ofs_new' */
dv = dvert;
for (i = 0; i < numVerts; i++, mv++) {
if (dv) {
@@ -539,7 +539,7 @@
}
if (ofs_new) {
- mv = mvert + ((ofs_new >= ofs_orig) ? 0 : numVerts);
+ mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? numVerts : 0);
for (i = 0; i < numVerts; i++, mv++) {
if (vert_accum[i]) { /* zero if unselected */
@@ -550,7 +550,7 @@
if (ofs_orig) {
/* same as above but swapped, intentional use of 'ofs_new' */
- mv = mvert + ((ofs_new >= ofs_orig) ? numVerts : 0);
+ mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts);
for (i = 0; i < numVerts; i++, mv++) {
if (vert_accum[i]) { /* zero if unselected */
More information about the Bf-blender-cvs
mailing list