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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-02-03 08:40:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-02-03 08:42:22 +0300
commitfaaaf7ee1f030b9b47e14c9787e9da5b0e78f08c (patch)
treeb90b7d85cc8191c69c2adcc5cfa6ce87fb85f93c /source/blender/editors/physics
parent32125c40d36228a5e2b21bbc28f959ebace84e98 (diff)
Possible NULL de-reference on fullsceen check
Also quiet some other minor warnings
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c3
1 files changed, 2 insertions, 1 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);