bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

== Sculpt Mode ==

Browse Source 
Fixed bug #6639 ] Sculpt mode clearing brush texture causes a crash (null pointer)

* Added code to clear the brush texture preview (used for propset) when deleting a brush texture
* Added a check in tex_strength() for an empty (NULL) texture slot to prevent the crash
This commit is contained in:
Nicholas Bishop 2007-05-03 19:11:54 +00:00
parent c71949419e
commit 674f23c536
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,9 +309,15 @@ void sculptmode_rem_tex(void *junk0,void *junk1)
{
MTex *mtex= G.scene->sculptdata.mtex[G.scene->sculptdata.texact];
if(mtex) {
SculptSession *ss= sculpt_session();
if(mtex->tex) mtex->tex->id.us--;
MEM_freeN(mtex);
G.scene->sculptdata.mtex[G.scene->sculptdata.texact]= NULL;
/* Clear brush preview */
if(ss->texcache) {
MEM_freeN(ss->texcache);
ss->texcache= NULL;
}
BIF_undo_push("Unlink brush texture");
allqueue(REDRAWBUTSEDIT, 0);
allqueue(REDRAWOOPS, 0);
@ -783,7 +789,7 @@ float tex_strength(EditData *e, float *point, const float len,const unsigned vin
SculptSession *ss= sculpt_session();
float avg= 1;
if(sd->texact==-1)
if(sd->texact==-1 || !sd->mtex[sd->texact])
avg= 1;
else if(sd->texrept==SCULPTREPT_3D) {
/* Get strength by feeding the vertex location directly