diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-19 20:57:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-19 20:57:04 +0400 |
| commit | 3d415325542730b610be0d1337c0f5ba13189e9c (patch) | |
| tree | 3cdc060e53df859138b498b1d96f9a3516ba04d5 /source/blender/editors | |
| parent | 7f1ae2497b01dfc026564420605b492944d685a6 (diff) | |
fix [#34244] Snap to face projection - Entire mesh is affected by projection when Proportional Editing mode is active, regardless of influence radius
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 5577619901a..e95fc6d7bb9 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -303,6 +303,9 @@ void applyProject(TransInfo *t) if (td->flag & TD_SKIP) continue; + + if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f)) + continue; copy_v3_v3(iloc, td->loc); if (t->flag & (T_EDIT | T_POSE)) { @@ -325,7 +328,14 @@ void applyProject(TransInfo *t) mul_m3_v3(td->smtx, tvec); - add_v3_v3(td->loc, tvec); + if ((t->flag & T_PROP_EDIT) == 0) { + add_v3_v3(td->loc, tvec); + } + else { + add_v3_v3(tvec, td->loc); + interp_v3_v3v3(td->loc, td->loc, tvec, td->factor); + } + } } |