diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-22 13:37:46 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-22 13:37:46 +0400 |
| commit | 193df0f5a08d05463b28c35cd7cc9aef622e5c0a (patch) | |
| tree | 1656f4e4baa2d1fe96ae74654ceb37bdb5b0b3a5 /source/blender/render | |
| parent | 95a13a2c02caec332d4d5b521441f1c49ddb07a3 (diff) | |
Fix #33951: Only margin is correctly baked for non-displacement baking
Was own mistake in recent changes.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index acb4fe062cf..dc49de52cc3 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2892,9 +2892,11 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up use_mask = TRUE; /* do we need buffer to store displacements */ - if ((R.r.bake_flag & R_BAKE_NORMALIZE) && R.r.bake_maxdist == 0.0f) { - use_displacement_buffer = TRUE; - use_mask = TRUE; + if (type == RE_BAKE_DISPLACEMENT) { + if ((R.r.bake_flag & R_BAKE_NORMALIZE) && R.r.bake_maxdist == 0.0f) { + use_displacement_buffer = TRUE; + use_mask = TRUE; + } } /* baker uses this flag to detect if image was initialized */ |