diff options
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf.c | 2 | ||||
| -rw-r--r-- | source/blender/src/buttons_editing.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/subsurf.c b/source/blender/blenkernel/intern/subsurf.c index 613cc69d9f7..2a2723686df 100644 --- a/source/blender/blenkernel/intern/subsurf.c +++ b/source/blender/blenkernel/intern/subsurf.c @@ -948,7 +948,7 @@ void subsurf_make_mesh(Object *ob, short subdiv) { void subsurf_to_mesh(Object *oldob, Mesh *me) { Mesh *oldme= oldob->data; - if (oldme->totface) { + if (oldme->totface && oldme->subdiv) { HyperMesh *hme= hypermesh_from_mesh(oldme, NULL); DispList *dl= subsurf_subdivide_to_displist(hme, oldme->subdiv, oldme->flag); DispListMesh *dlm= dl->mesh; diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 0022eae1416..5e614f5c337 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -380,8 +380,8 @@ static void editing_panel_mesh_type(Object *ob, Mesh *me) uiDefButS(block, TOG|BIT|7, B_MAKEDISP, "SubSurf", 10,124,130,17, &me->flag, 0, 0, 0, 0, "Treats the active object as a Catmull-Clark Subdivision Surface"); uiBlockSetCol(block, TH_AUTO); - uiDefButS(block, NUM, B_MAKEDISP, "Subdiv:", 10,104,100,18, &me->subdiv, 0, 12, 0, 0, "Defines the level of subdivision to display in real time interactively"); - uiDefButS(block, NUM, B_MAKEDISP, "", 110, 104, 30, 18, &me->subdivr, 0, 12, 0, 0, "Defines the level of subdivision to apply during rendering"); + uiDefButS(block, NUM, B_MAKEDISP, "Subdiv:", 10,104,100,18, &me->subdiv, 1, 6, 0, 0, "Defines the level of subdivision to display in real time interactively"); + uiDefButS(block, NUM, B_MAKEDISP, "", 110, 104, 30, 18, &me->subdivr, 1, 6, 0, 0, "Defines the level of subdivision to apply during rendering"); uiDefButS(block, TOG|BIT|8, B_MAKEDISP, "Optimal", 10,84,130,17, &me->flag, 0, 0, 0, 0, "Only draws optimal wireframe"); if(me->msticky) val= 1.0; else val= 0.0; |