diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-25 14:39:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-25 14:39:56 +0300 |
| commit | cbb23d96bb4644bd4fdeadbfd790694e57983c53 (patch) | |
| tree | 544b5674164199f17f423b94f976cdf12dadc756 /source/blender/blenkernel/intern/multires.c | |
| parent | aab5a7a4af19335f07231b30f86df8d2fc7bc9e7 (diff) | |
Added simplification back for quicker preview renders with less subdivision
levels, child particles, and shadow/SSS/AO quality.. Now also works on what
is displayed in the 3d view instead of only rendering, see panel in the scene
properties.
Most file changes were to make scene available in the isDisabled modifier
callback function.
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index f5414567da8..7f08846177a 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -50,6 +50,7 @@ #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_object.h" +#include "BKE_scene.h" #include "BKE_subsurf.h" #include "BKE_utildefines.h" @@ -84,11 +85,11 @@ MultiresModifierData *find_multires_modifier(Object *ob) static int multires_get_level(Object *ob, MultiresModifierData *mmd, int render) { if(render) - return mmd->renderlvl; + return get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl); else if(ob->mode == OB_MODE_SCULPT) return mmd->sculptlvl; else - return mmd->lvl; + return get_render_subsurf_level(&mmd->modifier.scene->r, mmd->lvl); } static void multires_set_tot_level(Object *ob, MultiresModifierData *mmd, int lvl) |