From f07df7287e60ede904993572fe9bfef2c3a324af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 4 Dec 2011 23:13:28 +0000 Subject: 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 --- source/blender/blenkernel/intern/multires.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source/blender/blenkernel/intern/multires.c') 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) -- cgit v1.2.3