[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50623] trunk/blender/source/blender: code cleanup: remove more invalid/paranoid NULL checks
Campbell Barton
ideasman42 at gmail.com
Sat Sep 15 09:42:30 CEST 2012
Revision: 50623
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50623
Author: campbellbarton
Date: 2012-09-15 07:42:30 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
code cleanup: remove more invalid/paranoid NULL checks
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2012-09-15 07:31:17 UTC (rev 50622)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2012-09-15 07:42:30 UTC (rev 50623)
@@ -1494,7 +1494,7 @@
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 @@
}
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);
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c 2012-09-15 07:31:17 UTC (rev 50622)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c 2012-09-15 07:42:30 UTC (rev 50623)
@@ -188,11 +188,9 @@
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
More information about the Bf-blender-cvs
mailing list