diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-10 02:00:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-10 02:10:52 +0300 |
| commit | 5a45ccaf3e5102ee571599fa9f26a78ac1f6d0f4 (patch) | |
| tree | 352b6b75c1b542aacb783296922c3ae85bcb8732 /intern/cycles/blender/blender_sync.cpp | |
| parent | d6e936254eb90496f21e97bdd00b1b8dacbf9b35 (diff) | |
Fix T47377: Newer file crashes at render on official 2.76b version
Really annoying bug, the code was not forward compatible at all and
resulted in crash. And it is really good to keep at least one release
forward compatibility so possible regressions could be verified easily.
The idea now is to use new property name for the pixel filter type,
but keep old property around for a couple of releases, so we have at
least some forward compatibility.
Don't like this situation at all, but seems it's least of the evil
we can choose.
Thanks Brecht for the review!
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index bdf207f0d36..7901d4b8be1 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -287,7 +287,7 @@ void BlenderSync::sync_film() film->use_sample_clamp = (integrator->sample_clamp_direct != 0.0f || integrator->sample_clamp_indirect != 0.0f); film->exposure = get_float(cscene, "film_exposure"); - film->filter_type = (FilterType)get_enum(cscene, "filter_type"); + film->filter_type = (FilterType)get_enum(cscene, "pixel_filter_type"); film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width"); if(b_scene.world()) { |