[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57959] branches/soc-2013-depsgraph_mt/ source/blender: Remove unused argument from utility curve functions

[Sergey Sharybin]

Revision: 57959
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57959
Author:   nazgul
Date:     2013-07-03 12:32:35 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Remove unused argument from utility curve functions

So far it was harmless, but with upcoming changes
having this argument could be confusing from logic
point of view.

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_modifier.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h	2013-07-03 12:32:29 UTC (rev 57958)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h	2013-07-03 12:32:35 UTC (rev 57959)
@@ -80,11 +80,11 @@
 
 ListBase *BKE_curve_nurbs_get(struct Curve *cu);
 
-float (*BKE_curve_vertexCos_get(struct Curve *cu, struct ListBase *lb, int *numVerts_r))[3];
-void BK_curve_vertexCos_apply(struct Curve *cu, struct ListBase *lb, float (*vertexCos)[3]);
+float (*BKE_curve_nurbs_vertexCos_get(struct ListBase *lb, int *numVerts_r))[3];
+void BK_curve_nurbs_vertexCos_apply(struct ListBase *lb, float (*vertexCos)[3]);
 
-float (*BKE_curve_keyVertexCos_get(struct Curve *cu, struct ListBase *lb, float *key))[3];
-void BKE_curve_keyVertexTilts_apply(struct Curve *cu, struct ListBase *lb, float *key);
+float (*BKE_curve_nurbs_keyVertexCos_get(struct ListBase *lb, float *key))[3];
+void BKE_curve_nurbs_keyVertexTilts_apply(struct ListBase *lb, float *key);
 
 void BKE_curve_editNurb_keyIndex_free(struct EditNurb *editnurb);
 void BKE_curve_editNurb_free(struct Curve *cu);

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-07-03 12:32:29 UTC (rev 57958)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-07-03 12:32:35 UTC (rev 57959)
@@ -3178,7 +3178,7 @@
 }
 
 
-float (*BKE_curve_vertexCos_get(Curve *UNUSED(cu), ListBase *lb, int *numVerts_r))[3]
+float (*BKE_curve_nurbs_vertexCos_get(ListBase *lb, int *numVerts_r))[3]
 {
 	int i, numVerts = *numVerts_r = BKE_nurbList_verts_count(lb);
 	float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos");
@@ -3207,7 +3207,7 @@
 	return cos;
 }
 
-void BK_curve_vertexCos_apply(Curve *UNUSED(cu), ListBase *lb, float (*vertexCos)[3])
+void BK_curve_nurbs_vertexCos_apply(ListBase *lb, float (*vertexCos)[3])
 {
 	float *co = vertexCos[0];
 	Nurb *nu;
@@ -3235,7 +3235,7 @@
 	}
 }
 
-float (*BKE_curve_keyVertexCos_get(Curve *UNUSED(cu), ListBase *lb, float *key))[3]
+float (*BKE_curve_nurbs_keyVertexCos_get(ListBase *lb, float *key))[3]
 {
 	int i, numVerts = BKE_nurbList_verts_count(lb);
 	float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "cu_vcos");
@@ -3266,7 +3266,7 @@
 	return cos;
 }
 
-void BKE_curve_keyVertexTilts_apply(Curve *UNUSED(cu), ListBase *lb, float *key)
+void BKE_curve_nurbs_keyVertexTilts_apply(ListBase *lb, float *key)
 {
 	Nurb *nu;
 	int i;

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c	2013-07-03 12:32:29 UTC (rev 57958)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c	2013-07-03 12:32:35 UTC (rev 57959)
@@ -820,7 +820,7 @@
 			 * tilts, which is passed through in the modifier stack.
 			 * this is also the reason curves do not use a virtual
 			 * shape key modifier yet. */
-			deformedVerts = BKE_curve_keyVertexCos_get(cu, nurb, keyVerts);
+			deformedVerts = BKE_curve_nurbs_keyVertexCos_get(nurb, keyVerts);
 			originalVerts = MEM_dupallocN(deformedVerts);
 			BLI_assert(BKE_nurbList_verts_count(nurb) == numVerts);
 		}
@@ -838,7 +838,7 @@
 				continue;
 
 			if (!deformedVerts) {
-				deformedVerts = BKE_curve_vertexCos_get(cu, nurb, &numVerts);
+				deformedVerts = BKE_curve_nurbs_vertexCos_get(nurb, &numVerts);
 				originalVerts = MEM_dupallocN(deformedVerts);
 			}
 
@@ -850,9 +850,9 @@
 	}
 
 	if (deformedVerts)
-		BK_curve_vertexCos_apply(cu, nurb, deformedVerts);
+		BK_curve_nurbs_vertexCos_apply(nurb, deformedVerts);
 	if (keyVerts) /* these are not passed through modifier stack */
-		BKE_curve_keyVertexTilts_apply(cu, nurb, keyVerts);
+		BKE_curve_nurbs_keyVertexTilts_apply(nurb, keyVerts);
 
 	if (keyVerts)
 		MEM_freeN(keyVerts);
@@ -1051,7 +1051,7 @@
 	}
 
 	if (deformedVerts) {
-		BK_curve_vertexCos_apply(ob->data, nurb, originalVerts);
+		BK_curve_nurbs_vertexCos_apply(nurb, originalVerts);
 		MEM_freeN(originalVerts);
 		MEM_freeN(deformedVerts);
 	}

Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_modifier.c	2013-07-03 12:32:29 UTC (rev 57958)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_modifier.c	2013-07-03 12:32:35 UTC (rev 57959)
@@ -637,9 +637,9 @@
 		cu = ob->data;
 		BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices");
 
-		vertexCos = BKE_curve_vertexCos_get(cu, &cu->nurb, &numVerts);
+		vertexCos = BKE_curve_nurbs_vertexCos_get(&cu->nurb, &numVerts);
 		mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0);
-		BK_curve_vertexCos_apply(cu, &cu->nurb, vertexCos);
+		BK_curve_nurbs_vertexCos_apply(&cu->nurb, vertexCos);
 
 		MEM_freeN(vertexCos);