[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49575] trunk/blender/source/blender: fix uninitialized memory use for mask feather points, also remove some double promotions.

[Campbell Barton]

Revision: 49575
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49575
Author:   campbellbarton
Date:     2012-08-05 13:26:39 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
fix uninitialized memory use for mask feather points, also remove some double 
promotions.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask.c
    trunk/blender/source/blender/render/intern/raytrace/bvh.h
    trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c       2012-08-05 
12:54:39 UTC (rev 49574)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c       2012-08-05 
13:26:39 UTC (rev 49575)
@@ -1287,12 +1287,13 @@
 void BKE_mask_point_add_uw(MaskSplinePoint *point, float u, float w)
 {
        if (!point->uw)
-               point->uw = MEM_callocN(sizeof(*point->uw), "mask point uw");
+               point->uw = MEM_mallocN(sizeof(*point->uw), "mask point uw");
        else
                point->uw = MEM_reallocN(point->uw, (point->tot_uw + 1) * 
sizeof(*point->uw));
 
        point->uw[point->tot_uw].u = u;
        point->uw[point->tot_uw].w = w;
+       point->uw[point->tot_uw].flag = 0;
 
        point->tot_uw++;
 

Modified: trunk/blender/source/blender/render/intern/raytrace/bvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/bvh.h   2012-08-05 
12:54:39 UTC (rev 49574)
+++ trunk/blender/source/blender/render/intern/raytrace/bvh.h   2012-08-05 
13:26:39 UTC (rev 49575)
@@ -133,7 +133,7 @@
 template<class Tree>
 static float bvh_cost(Tree *obj)
 {
-       assert(obj->cost >= 0.0);
+       assert(obj->cost >= 0.0f);
        return obj->cost;
 }
 

Modified: 
trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp  
2012-08-05 12:54:39 UTC (rev 49574)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp  
2012-08-05 13:26:39 UTC (rev 49575)
@@ -118,7 +118,7 @@
        for (i = 0; i < 3; i++) {
                isec->idot_axis[i]        = 1.0f / isec->dir[i];
 
-               isec->bv_index[2 * i]     = isec->idot_axis[i] < 0.0 ? 1 : 0;
+               isec->bv_index[2 * i]     = isec->idot_axis[i] < 0.0f ? 1 : 0;
                isec->bv_index[2 * i + 1] = 1 - isec->bv_index[2 * i];
 
                isec->bv_index[2 * i]     = i + 3 * isec->bv_index[2 * i];
@@ -161,7 +161,7 @@
 
        // restore bv_index
        for (i = 0; i < 3; i++) {
-               isec->bv_index[2 * i]     = isec->idot_axis[i] < 0.0 ? 1 : 0;
+               isec->bv_index[2 * i]     = isec->idot_axis[i] < 0.0f ? 1 : 0;
                isec->bv_index[2 * i + 1] = 1 - isec->bv_index[2 * i];
 
                isec->bv_index[2 * i]     = i + 3 * isec->bv_index[2 * i];

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