archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix two potential bugs reported by latest coverity scan.

Browse Source
This commit is contained in:
Bastien Montagne
2015-01-19 17:51:25 +01:00
parent 50cbff1851
commit a8fa291b8c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/interface/interface_eyedropper.c
View File

@@ -830,8 +830,10 @@ static void depthdropper_depth_set(bContext *C, DepthDropper *ddr, const float d
/* set sample from accumulated values */
static void depthdropper_depth_set_accum(bContext *C, DepthDropper *ddr)
{
float depth;
depth = ddr->accum_depth * 1.0f / (float)ddr->accum_tot;
float depth = ddr->accum_depth;
if (ddr->accum_tot) {
depth /= (float)ddr->accum_tot;
}
depthdropper_depth_set(C, ddr, depth);
}

4
source/blender/editors/mesh/editmesh_knife.c
View File

@@ -1241,7 +1241,9 @@ static BMElem *bm_elem_from_knife_vert(KnifeVert *kfv, KnifeEdge **r_kfe)
for (ref = kfv->edges.first; ref; ref = ref->next) {
kfe = ref->ref;
if (kfe->e) {
*r_kfe = kfe;
if (r_kfe) {
*r_kfe = kfe;
}
break;
}
}