kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: remove more invalid/paranoid NULL checks

Browse Source
This commit is contained in:
Campbell Barton 2012-09-15 07:42:30 +00:00
parent fed6b2bcb7
commit 5dbd603363
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_regions.c
View File

@ -1494,7 +1494,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
BLI_rctf_translate(&block->rect, xof, yof);
/* safety calculus */
if (but) {
{
const float midx = BLI_RCT_CENTER_X(&butrct);
const float midy = BLI_RCT_CENTER_Y(&butrct);
@ -1521,20 +1521,13 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
}
block->direction = dir1;
}
else {
block->safety.xmin = block->rect.xmin - 40;
block->safety.ymin = block->rect.ymin - 40;
block->safety.xmax = block->rect.xmax + 40;
block->safety.ymax = block->rect.ymax + 40;
}
/* keep a list of these, needed for pulldown menus */
saferct = MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
saferct->parent = butrct;
saferct->safety = block->safety;
BLI_freelistN(&block->saferct);
if (but)
BLI_duplicatelist(&block->saferct, &but->block->saferct);
BLI_duplicatelist(&block->saferct, &but->block->saferct);
BLI_addhead(&block->saferct, saferct);
}

8
source/blender/modifiers/intern/MOD_particlesystem.c
View File

@ -188,11 +188,9 @@ static void deformVerts(ModifierData *md, Object *ob,
psmd->totdmface = psmd->dm->getNumTessFaces(psmd->dm);
}
if (psys) {
psmd->flag &= ~eParticleSystemFlag_psys_updated;
particle_system_update(md->scene, ob, psys);
psmd->flag |= eParticleSystemFlag_psys_updated;
}
psmd->flag &= ~eParticleSystemFlag_psys_updated;
particle_system_update(md->scene, ob, psys);
psmd->flag |= eParticleSystemFlag_psys_updated;
}
/* disabled particles in editmode for now, until support for proper derivedmesh