Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 00:58:00 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 00:58:00 +0300
commitd440990414fafa1e30d83622b10671e089437b62 (patch)
tree8401799056c5bf9492e9dbe69742a68f7f6d8456 /source/blender/blenkernel/intern/multires.c
parentabd9a59af4a8499129c4c847b3b19e64cead73b8 (diff)
Fix #20820: multires subdivide crash.
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 7f08846177a..6ed4f7a7703 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -85,11 +85,11 @@ MultiresModifierData *find_multires_modifier(Object *ob)
static int multires_get_level(Object *ob, MultiresModifierData *mmd, int render)
{
if(render)
- return get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl);
+ return (mmd->modifier.scene)? get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl): mmd->renderlvl;
else if(ob->mode == OB_MODE_SCULPT)
return mmd->sculptlvl;
else
- return get_render_subsurf_level(&mmd->modifier.scene->r, mmd->lvl);
+ return (mmd->modifier.scene)? get_render_subsurf_level(&mmd->modifier.scene->r, mmd->lvl): mmd->lvl;
}
static void multires_set_tot_level(Object *ob, MultiresModifierData *mmd, int lvl)