Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-01-19 19:51:25 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-01-19 19:51:25 +0300
commita8fa291b8c539da7669463ef622d5c61ee9c90e7 (patch)
treefc20d7096791dba8e7213d7dbd1939a3502716e1 /source
parent50cbff185130e914f423a6008e71af035f44dd8f (diff)
Fix two potential bugs reported by latest coverity scan.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_eyedropper.c6
-rw-r--r--source/blender/editors/mesh/editmesh_knife.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index d7a4720d595..9b5d067e9be 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -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);
}
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 0a78f299159..e8a5202029b 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -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;
}
}