diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-29 18:50:33 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-29 18:50:33 +0400 |
| commit | 6783372dd5ddb5c3e7821abcafc62fa9afb6a13d (patch) | |
| tree | 635edf6a658526f7471418c0096b4d856eadc275 | |
| parent | 41356b0e7db82f37655e99580094f2375157f231 (diff) | |
Merge for final release
- One-liner fix for sculpting
- Splash without RC3 caption
--
svn merge -c60872 -c60900 ^/trunk/blender
| -rw-r--r-- | release/datafiles/splash.png | bin | 222210 -> 220834 bytes | |||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex b39246dd3db..ad0028ee0b4 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 49deca6a18d..85fae63039f 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -2488,7 +2488,7 @@ static void calc_area_normal_and_flatten_center(Sculpt *sd, Object *ob, /* for flatten center */ add_v3_v3(fc, private_fc); - add_v3_v3(fc_flip, private_fc); + add_v3_v3(fc_flip, private_fc_flip); count += private_count; count_flipped += private_count_flip; } |
