[Bf-blender-cvs] [793aaa47ec] snap_system_clip_planes: Fix MEM_reallocN use

[Germano Cavalcante]

Commit: 793aaa47ec3eadfb964da36ab62e42e6d2d2548e
Author: Germano Cavalcante
Date:   Fri Feb 24 12:46:02 2017 -0300
Branches: snap_system_clip_planes
https://developer.blender.org/rB793aaa47ec3eadfb964da36ab62e42e6d2d2548e

Fix MEM_reallocN use

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

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 cc520ac1cf..63aa00f1f8 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -444,11 +444,8 @@ static bool snapdata_init_v3d(
 
        if (rv3d->rflag & RV3D_CLIPPING) {
                /* Referencing or copying? */
-               snpdt->clip.plane = MEM_mallocN( 4 * sizeof(float[4]), 
__func__);
-               for (int i = 0; i < 4; i++) {
-                       copy_v4_v4(snpdt->clip.plane[i], rv3d->clip[i]);
-               }
-               //memcpy(snpdt->clip.plane, rv3d->clip, 4 * sizeof(float[4]));
+               snpdt->clip.plane = MEM_mallocN( 4 * 
sizeof(*snpdt->clip.plane), __func__);
+               memcpy(snpdt->clip.plane, rv3d->clip, 4 * 
sizeof(*snpdt->clip.plane));
                snpdt->clip.plane_num = 4;
 
                float dummy_ray_end[3];
@@ -2626,7 +2623,8 @@ static bool 
transform_snap_context_project_view3d_mixed_impl(
                                mul_m4_v3(imat, normal_local);
 
                                if (snpdt->clip.plane) {
-#if PREPEND_PLANE
+#define PREPEND_PLANE
+#ifdef PREPEND_PLANE
                                        /* Alloc the new plane at the beginning 
of the array */
                                        float (*temp_plane)[4] = MEM_mallocN(
                                                sizeof(*temp_plane) * 
(snpdt->clip.plane_num + 1), __func__);
@@ -2638,7 +2636,8 @@ static bool 
transform_snap_context_project_view3d_mixed_impl(
 
                                        snpdt->clip.plane = temp_plane;
 #else
-                                       snpdt->clip.plane = 
MEM_reallocN(snpdt->clip.plane, snpdt->clip.plane_num + 1);
+                                       snpdt->clip.plane = MEM_reallocN(
+                                               snpdt->clip.plane, 
sizeof(*snpdt->clip.plane) * snpdt->clip.plane_num + 1);
 #endif
                                }
                                else {
@@ -2705,7 +2704,7 @@ static bool 
transform_snap_context_project_view3d_mixed_impl(
 
                                mul_m4_v3(obmat, far_vert);
 
-#if PREPEND_PLANE
+#ifdef PREPEND_PLANE
                                plane_from_point_normal_v3(
                                        snpdt->clip.plane[0], far_vert, 
plane_no);

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