[Bf-blender-cvs] [22156d951d] master: fix T50602: Avoid crash when executing `transform_snap_context_project_view3d_mixed` with `dist_px` NULL

[Germano Cavalcante]

Commit: 22156d951dbd4e1150ede7fd3769347265694bd7
Author: Germano Cavalcante
Date:   Mon Feb 6 01:01:39 2017 -0300
Branches: master
https://developer.blender.org/rB22156d951dbd4e1150ede7fd3769347265694bd7

fix T50602: Avoid crash when executing 
`transform_snap_context_project_view3d_mixed` with `dist_px` NULL

===================================================================

M       source/blender/editors/transform/transform_snap_object.c

===================================================================

diff --git a/source/blender/editors/transform/transform_snap_object.c 
b/source/blender/editors/transform/transform_snap_object.c
index 0e4ec12e18..7c9dc43dbe 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,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs