diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
| commit | f07df7287e60ede904993572fe9bfef2c3a324af (patch) | |
| tree | 205c89f1890164ad384dcd3e5d09547d44287ee3 /source/blender/blenkernel/intern/multires.c | |
| parent | 3267a619f1e1a5b5508e38cbc665da79f450b2e3 (diff) | |
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 40de735e15f..035c7f409c4 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -132,9 +132,6 @@ MultiresModifierData *get_multires_modifier(Scene *scene, Object *ob, int use_fi static int multires_get_level(Object *ob, MultiresModifierData *mmd, int render) { - if (!ob || !mmd) - return 0; - if(render) return (mmd->modifier.scene)? get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl): mmd->renderlvl; else if(ob->mode == OB_MODE_SCULPT) |