[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23128] branches/blender2.5/blender/source /blender: 2.5: fix for merge, forward_diff_bezier needed to be updated.

Brecht Van Lommel brecht at blender.org
Fri Sep 11 16:56:54 CEST 2009


Revision: 23128
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23128
Author:   blendix
Date:     2009-09-11 16:56:54 +0200 (Fri, 11 Sep 2009)

Log Message:
-----------
2.5: fix for merge, forward_diff_bezier needed to be updated.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
    branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
    branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
    branches/blender2.5/blender/source/blender/python/generic/Geometry.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-09-11 14:56:54 UTC (rev 23128)
@@ -1647,8 +1647,8 @@
 	vec[2][0]= vec[3][0]-dist;
 	vec[2][1]= vec[3][1];
 	
-	forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, 2);
-	forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, 2);
+	forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
+	forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
 	
 	return 1;
 }

Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c	2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c	2009-09-11 14:56:54 UTC (rev 23128)
@@ -675,8 +675,8 @@
 				
 				correct_bezpart(v1, v2, v3, v4);
 				
-				forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, 3);
-				forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, 3);
+				forward_diff_bezier(v1[0], v2[0], v3[0], v4[0], data, resol, sizeof(float)*3);
+				forward_diff_bezier(v1[1], v2[1], v3[1], v4[1], data+1, resol, sizeof(float)*3);
 				
 				for (fp= data; resol; resol--, fp+= 3)
 					glVertex2fv(fp);

Modified: branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c	2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c	2009-09-11 14:56:54 UTC (rev 23128)
@@ -2598,8 +2598,8 @@
 	else {
 		
 		/* always do all three, to prevent data hanging around */
-		forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, 2);
-		forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, 2);
+		forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
+		forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
 		
 		return 1;
 	}

Modified: branches/blender2.5/blender/source/blender/python/generic/Geometry.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Geometry.c	2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/python/generic/Geometry.c	2009-09-11 14:56:54 UTC (rev 23128)
@@ -523,7 +523,7 @@
 	
 	coord_array = MEM_callocN(dims * (resolu) * sizeof(float), "BezierInterp");
 	for(i=0; i<dims; i++) {
-		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, dims);
+		forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i, resolu-1, sizeof(float)*dims);
 	}
 	
 	list= PyList_New(resolu);





More information about the Bf-blender-cvs mailing list