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

Minor cleanup (paranoid checks) and fixes from coverity.

Browse Source
This commit is contained in:
Bastien Montagne
2015-12-28 16:48:35 +01:00
parent 6f1c44e611
commit 6c99d342d8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_view3d/drawarmature.c
View File

@@ -119,11 +119,12 @@ static void set_pchan_colorset(Object *ob, bPoseChannel *pchan)
bcolor = &btheme->tarm[(color_index - 1)];
}
else if (color_index == -1) {
/* use the group's own custom color set */
bcolor = (grp) ? &grp->cs : NULL;
/* use the group's own custom color set (grp is always != NULL here) */
bcolor = &grp->cs;
}
else
else {
bcolor = NULL;
}
}
/* This function is for brightening/darkening a given color (like UI_ThemeColorShade()) */
@@ -1435,7 +1436,8 @@ static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
if (segcount == data->chainlen || segcount > 255) break; /* 255 is weak */
parchan = parchan->parent;
}
if (parchan) /* XXX revise the breaking conditions to only stop at the tail? */
/* Only draw line in case our chain is more than one bone long! */
if (parchan != pchan) /* XXX revise the breaking conditions to only stop at the tail? */
glVertex3fv(parchan->pose_head);
glEnd();

2
source/blender/editors/space_view3d/drawobject.c
View File

@@ -4297,7 +4297,7 @@ static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3
GPU_end_object_materials();
if (obedit != ob && finalDM)
if (obedit != ob)
finalDM->release(finalDM);
}
else {