griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a number of crashes occuring when loading saved files with sculpt mode active. (mostly missing checks for a sculpt session.)

Browse Source
This commit is contained in:
Nicholas Bishop
2006-12-25 23:52:17 +00:00
parent 3fe44bf83a
commit b27785c4df
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/drawview.c
View File

@@ -2745,8 +2745,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
persp(PERSP_WIN); // set ortho
/* Draw Sculpt Mode brush */
if(!G.obedit && (G.f & G_SCULPTMODE) && area_is_active_area(v3d->area)) {
PropsetData *pd= G.scene->sculptdata.session->propset;
if(!G.obedit && (G.f & G_SCULPTMODE) && area_is_active_area(v3d->area) && sculpt_session()) {
PropsetData *pd= sculpt_session()->propset;
short r1=100, r2=100, r3=100;
if(pd) {
if(pd->mode == PropsetSize) {

5
source/blender/src/sculptmode.c
View File

@@ -1651,6 +1651,11 @@ void sculpt()
ob= OBACT;
if(ob->id.lib) return;
if(!ss) {
sculpt_init_session();
ss= sd->session;
}
/* Make sure that the active mesh is set correctly */
if(get_mesh(OBACT) != get_mesh(ob))

8
source/blender/src/space.c
View File

@@ -1068,7 +1068,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
if(!mouse_in_header(sa)) {
if(!G.obedit && (G.f & G_SCULPTMODE)) {
if(sculpt_session()->propset) {
SculptSession *ss= sculpt_session();
if(ss && ss->propset) {
sculptmode_propset(event);
return;
}
@@ -1210,7 +1211,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
}
}
else if(!G.obedit && (G.f & G_SCULPTMODE)) {
SculptData *sd= &G.scene->sculptdata;
SculptData *sd= sculpt_data();
SculptSession *ss= sculpt_session();
BrushData *br= sculptmode_brush();
Mesh *me= get_mesh(OBACT);
char update_prop= 0;
@@ -1218,7 +1220,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
case LEFTMOUSE:
if(G.qual==LR_SHIFTKEY+LR_CTRLKEY)
sculptmode_pmv(0);
else if(!sculpt_session()->propset)
else if(!(ss && ss->propset))
sculpt();
break;
/* View */