[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50584] trunk/blender/source/blender: fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated .
Campbell Barton
ideasman42 at gmail.com
Fri Sep 14 08:17:14 CEST 2012
Revision: 50584
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50584
Author: campbellbarton
Date: 2012-09-14 06:17:14 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/physics/particle_object.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
trunk/blender/source/blender/editors/space_node/node_group.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/imbuf/intern/iris.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -2081,7 +2081,7 @@
if ((*final_r)->type != DM_TYPE_EDITBMESH) {
DM_ensure_tessface(*final_r);
}
- if (cage_r) {
+ if (cage_r && *cage_r) {
if ((*cage_r)->type != DM_TYPE_EDITBMESH) {
if (*cage_r != *final_r) {
DM_ensure_tessface(*cage_r);
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -488,7 +488,7 @@
/* test for cyclic */
bl = cu->bev.first;
if (!bl->nr) return 0;
- if (bl && bl->poly > -1) cycl = 1;
+ if (bl->poly > -1) cycl = 1;
if (cycl == 0) {
ctime1 = CLAMPIS(ctime, 0.0f, 1.0f);
Modified: trunk/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_draw.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/animation/keyframes_draw.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -412,7 +412,7 @@
* -> firstly, handles must have same central value as each other
* -> secondly, handles which control that section of the curve must be constant
*/
- if ((!prev) || (!beztn)) return;
+ if (prev == NULL) return;
if (IS_EQF(beztn->vec[1][1], prev->vec[1][1]) == 0) return;
if (IS_EQF(beztn->vec[1][1], beztn->vec[0][1]) == 0) return;
if (IS_EQF(prev->vec[1][1], prev->vec[2][1]) == 0) return;
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -2350,20 +2350,18 @@
for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
pose_bone_do_paste(ob, pchan, only_select, 0);
}
-
+
/* free temp data - free manually as was copied without constraints */
- if (dummyPose) {
- for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
- if (pchan->prop) {
- IDP_FreeProperty(pchan->prop);
- MEM_freeN(pchan->prop);
- }
+ for (pchan = dummyPose->chanbase.first; pchan; pchan = pchan->next) {
+ if (pchan->prop) {
+ IDP_FreeProperty(pchan->prop);
+ MEM_freeN(pchan->prop);
}
-
- /* was copied without constraints */
- BLI_freelistN(&dummyPose->chanbase);
- MEM_freeN(dummyPose);
}
+
+ /* was copied without constraints */
+ BLI_freelistN(&dummyPose->chanbase);
+ MEM_freeN(dummyPose);
}
else {
/* no animation, so just reset whole pose to rest pose
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -835,7 +835,7 @@
if (G.debug & G_DEBUG)
printf("%s, error: requested preview image does not exist", __func__);
}
- if (!prv_img->rect[size]) {
+ else if (!prv_img->rect[size]) {
prv_img->w[size] = render_size;
prv_img->h[size] = render_size;
prv_img->changed[size] = 1;
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/interface/resources.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -944,7 +944,7 @@
}
}
-bTheme *UI_GetTheme()
+bTheme *UI_GetTheme(void)
{
return U.themes.first;
}
Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -442,18 +442,20 @@
}
if (me->totpoly) {
- /* make mapping for materials */
- for (a = 1; a <= base->object->totcol; a++) {
- ma = give_current_material(base->object, a);
+ if (totmat) {
+ /* make mapping for materials */
+ for (a = 1; a <= base->object->totcol; a++) {
+ ma = give_current_material(base->object, a);
- for (b = 0; b < totcol; b++) {
- if (ma == matar[b]) {
- matmap[a - 1] = b;
- break;
+ for (b = 0; b < totcol; b++) {
+ if (ma == matar[b]) {
+ matmap[a - 1] = b;
+ break;
+ }
}
}
}
-
+
CustomData_merge(&me->pdata, &pdata, CD_MASK_MESH, CD_DEFAULT, totpoly);
CustomData_copy_data(&me->pdata, &pdata, 0, polyofs, me->totpoly);
Modified: trunk/blender/source/blender/editors/physics/particle_object.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_object.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/physics/particle_object.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -98,12 +98,14 @@
static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op))
{
- Object *ob= ED_object_context(C);
+ Object *ob = ED_object_context(C);
Scene *scene = CTX_data_scene(C);
- int mode_orig = ob->mode;
+ int mode_orig;
+
if (!scene || !ob)
return OPERATOR_CANCELLED;
+ mode_orig = ob->mode;
object_remove_particle_system(scene, ob);
/* possible this isn't the active object
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -1370,12 +1370,12 @@
if (event->type == EVT_ACTIONZONE_AREA) {
sActionzoneData *sad = event->customdata;
- if (sad->modifier > 0) {
+ if (sad == NULL || sad->modifier > 0) {
return OPERATOR_PASS_THROUGH;
}
/* verify *sad itself */
- if (sad == NULL || sad->sa1 == NULL || sad->az == NULL)
+ if (sad->sa1 == NULL || sad->az == NULL)
return OPERATOR_PASS_THROUGH;
/* is this our *sad? if areas not equal it should be passed on */
@@ -2284,12 +2284,12 @@
if (event->type == EVT_ACTIONZONE_AREA) {
sActionzoneData *sad = event->customdata;
- if (sad->modifier > 0) {
+ if (sad == NULL || sad->modifier > 0) {
return OPERATOR_PASS_THROUGH;
}
/* verify *sad itself */
- if (sad == NULL || sad->sa1 == NULL || sad->sa2 == NULL)
+ if (sad->sa1 == NULL || sad->sa2 == NULL)
return OPERATOR_PASS_THROUGH;
/* is this our *sad? if areas equal it should be passed on */
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -5372,8 +5372,8 @@
if (!imapaint->paintcursor) {
imapaint->paintcursor =
- WM_paint_cursor_activate(wm, image_paint_poll,
- brush_drawcursor, NULL);
+ WM_paint_cursor_activate(wm, image_paint_poll,
+ brush_drawcursor, NULL);
}
}
}
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_texture.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_texture.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -341,7 +341,7 @@
{
/* callback when opening texture user selection menu, to create buttons. */
SpaceButs *sbuts = CTX_wm_space_buts(C);
- ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL;
+ ButsContextTexture *ct = sbuts->texuser;
ButsTextureUser *user;
uiBlock *block = uiLayoutGetBlock(layout);
const char *last_category = NULL;
Modified: trunk/blender/source/blender/editors/space_node/node_group.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_group.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/space_node/node_group.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -950,7 +950,7 @@
int toselect = (link->tonode && (link->tonode->flag & NODE_SELECT) && link->tonode != gnode);
linkn = link->next;
- if (gnode && ((fromselect && link->tonode == gnode) || (toselect && link->fromnode == gnode))) {
+ if ((fromselect && link->tonode == gnode) || (toselect && link->fromnode == gnode)) {
/* remove all links to/from the gnode.
* this can remove link information, but there's no general way to preserve it.
*/
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-09-14 06:15:46 UTC (rev 50583)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-09-14 06:17:14 UTC (rev 50584)
@@ -7232,7 +7232,7 @@
setlinestyle(0);
}
}
- else if ((curcon->flag & CONSTRAINT_EXPAND) && (cti) && (cti->get_constraint_targets)) {
+ else if ((curcon->flag & CONSTRAINT_EXPAND) && (cti->get_constraint_targets)) {
cti->get_constraint_targets(curcon, &targets);
for (ct = targets.first; ct; ct = ct->next) {
Modified: trunk/blender/source/blender/editors/util/ed_util.c
===================================================================
--- trunk/blender/source/blender/editors/util/ed_util.c 2012-09-14 06:15:46 UTC (rev 50583)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list