diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-03 08:40:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-03 08:42:22 +0300 |
commit | faaaf7ee1f030b9b47e14c9787e9da5b0e78f08c (patch) | |
tree | b90b7d85cc8191c69c2adcc5cfa6ce87fb85f93c /source/blender | |
parent | 32125c40d36228a5e2b21bbc28f959ebace84e98 (diff) |
Possible NULL de-reference on fullsceen check
Also quiet some other minor warnings
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 3 | ||||
-rw-r--r-- | source/blender/editors/render/render_view.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 0b1794e7764..6c90e319bc6 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -420,8 +420,9 @@ static void PE_create_shape_tree(PEData *data, Object *shapeob) memset(&data->shape_bvh, 0, sizeof(data->shape_bvh)); - if (!shapeob || !shapeob->derivedFinal) + if (!dm) { return; + } DM_ensure_tessface(dm); bvhtree_from_mesh_faces(&data->shape_bvh, dm, 0.0f, 4, 8); diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index ed78f8e0eaa..fe357a7a0e2 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -164,7 +164,7 @@ ScrArea *render_view_open(bContext *C, int mx, int my) /* if the active screen is already in fullscreen mode, skip this and * unset the area, so that the fullscreen area is just changed later */ - if (sa->full) { + if (sa && sa->full) { sa = NULL; } else { diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 14e3f6b6445..91cabcaee9f 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3104,6 +3104,9 @@ static void proj_paint_state_viewport_init(ProjPaintState *ps) ps->clipend = params.clipend; ps->is_ortho = params.is_ortho; } + else { + BLI_assert(0); + } /* same as #ED_view3d_ob_project_mat_get */ mul_m4_m4m4(vmat, viewmat, ps->ob->obmat); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index fae2020c878..394d148de54 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -390,7 +390,7 @@ static void node_draw_frame_label(bNodeTree *ntree, bNode *node, const float asp float width, ascender; float x, y; const int font_size = data->label_size / aspect; - const float margin = NODE_DY / 4; + const float margin = (float)(NODE_DY / 4); nodeLabel(ntree, node, label, sizeof(label)); |