diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-28 03:56:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-28 03:56:29 +0400 |
| commit | 2022580ce19beeab0371cd69bf696153e597895c (patch) | |
| tree | de3505d9fbe721825fb2f5fc8d6382305e388ee1 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | 756edb34c6e927587ba7f1aa08fb41e1b8ef6e7a (diff) | |
| parent | a2e10608626a9b3bd8a17cf4264a54ce2f03ed6f (diff) | |
svn merge ^/trunk/blender -r42194:42197
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index f61254581ac..aa8ff43d423 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1693,7 +1693,7 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData } /* apply weights into a vertex group, if doesnt exists add a new layer */ - if (defgrp_index >= 0 && !dvert && strlen(surface->output_name)>0) + if (defgrp_index >= 0 && !dvert && (surface->output_name[0] != '\0')) dvert = CustomData_add_layer_named(&result->vertData, CD_MDEFORMVERT, CD_CALLOC, NULL, sData->total_points, surface->output_name); if (defgrp_index >= 0 && dvert) { @@ -2282,10 +2282,10 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) tPoint->quad = (isInside == 2) ? 1 : 0; /* quad or tri part*/ /* save vertex indexes */ - tPoint->v1 = (isInside == 2) ? mface[i].v1 : mface[i].v1; + tPoint->v1 = mface[i].v1; /* (isInside == 2) ? mface[i].v1 : mface[i].v1; */ /* same! */ tPoint->v2 = (isInside == 2) ? mface[i].v3 : mface[i].v2; tPoint->v3 = (isInside == 2) ? mface[i].v4 : mface[i].v3; - + sample = 5; /* make sure we exit sample loop as well */ break; } |