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:
authorGermano Cavalcante <germano.costa@ig.com.br>2017-02-06 07:01:39 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2017-02-06 07:01:39 +0300
commit22156d951dbd4e1150ede7fd3769347265694bd7 (patch)
treee55e41034d60d9c8211d552d0881b5958f0efa48 /source/blender/editors/transform/transform_snap_object.c
parentda08aa4b96d80f7193edb7f1b5c507f197d657ce (diff)
fix T50602: Avoid crash when executing `transform_snap_context_project_view3d_mixed` with `dist_px` NULL
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
-rw-r--r--source/blender/editors/transform/transform_snap_object.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 0e4ec12e18f..7c9dc43dbe4 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -2028,11 +2028,13 @@ static bool transform_snap_context_project_view3d_mixed_impl(
BLI_assert((snap_to_flag & ~(1 | 2 | 4)) == 0);
if (use_depth) {
- const float dist_px_orig = *dist_px;
+ const float dist_px_orig = dist_px ? *dist_px : 0;
for (int i = 2; i >= 0; i--) {
if (snap_to_flag & (1 << i)) {
- if (i == 0)
+ if (i == 0) {
+ BLI_assert(dist_px != NULL);
*dist_px = dist_px_orig;
+ }
if (ED_transform_snap_object_project_view3d(
sctx,
elem_type[i], params,