forked from bartvdbraak/blender
crash fix for sculpt when loading some files
This commit is contained in:
parent
6c1bbcd8a2
commit
4aa15ee9f2
@ -690,7 +690,7 @@ class VIEW3D_PT_sculpt_options(PaintPanel):
|
||||
bl_label = "Options"
|
||||
|
||||
def poll(self, context):
|
||||
return context.sculpt_object
|
||||
return (context.sculpt_object and context.tool_settings.sculpt)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
@ -2796,6 +2796,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
|
||||
}
|
||||
}
|
||||
else if(dt==OB_SOLID) {
|
||||
Paint *p;
|
||||
|
||||
if((v3d->flag&V3D_SELECT_OUTLINE) && (base->flag&SELECT) && !draw_wire && !ob->sculpt)
|
||||
draw_mesh_object_outline(v3d, ob, dm);
|
||||
|
||||
@ -2804,8 +2806,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
|
||||
glEnable(GL_LIGHTING);
|
||||
glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
|
||||
|
||||
if(ob->sculpt) {
|
||||
Paint *p = paint_get_active(scene);
|
||||
if(ob->sculpt && (p=paint_get_active(scene))) {
|
||||
float planes[4][4];
|
||||
float (*fpl)[4] = NULL;
|
||||
int fast= (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
|
||||
|
Loading…
Reference in New Issue
Block a user