diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:26:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:26:43 +0400 |
| commit | 40b05d364e988bca01dd338026dc24765f56187a (patch) | |
| tree | 83e4d808d93cf9c78c128738044106b127fa6dff /intern/cycles/blender/blender_sync.cpp | |
| parent | 8588fec935c47529d9c1816f19e94ff0d20ed1a9 (diff) | |
Cycles: code refactoring to add generic lookup table memory.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index f6ff78ab2ac..66401d80a2e 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -19,7 +19,6 @@ #include "background.h" #include "camera.h" #include "film.h" -#include "../render/filter.h" #include "graph.h" #include "integrator.h" #include "light.h" @@ -213,18 +212,11 @@ void BlenderSync::sync_film() Film prevfilm = *film; film->exposure = get_float(cscene, "film_exposure"); + film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type"); + film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width"); if(film->modified(prevfilm)) film->tag_update(scene); - - Filter *filter = scene->filter; - Filter prevfilter = *filter; - - filter->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type"); - filter->filter_width = (filter->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width"); - - if(filter->modified(prevfilter)) - filter->tag_update(scene); } /* Render Layer */ |