[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55395] branches/soc-2008-mxcurioni/source /blender: fix for some errors.

[Campbell Barton]

Revision: 55395
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55395
Author:   campbellbarton
Date:     2013-03-18 22:51:01 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
fix for some errors.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2013-03-18 22:37:04 UTC (rev 55394)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2013-03-18 22:51:01 UTC (rev 55395)
@@ -876,7 +876,7 @@
 		BKE_report(op->reports, RPT_ERROR, "No active lineset and associated line style to add the modifier to");
 		return OPERATOR_CANCELLED;
 	}
-	if (FRS_add_linestyle_color_modifier(lineset->linestyle, type) < 0) {
+	if (FRS_add_linestyle_color_modifier(lineset->linestyle, type) == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Unknown line color modifier type.");
 		return OPERATOR_CANCELLED;
 	}
@@ -915,7 +915,7 @@
 		BKE_report(op->reports, RPT_ERROR, "No active lineset and associated line style to add the modifier to");
 		return OPERATOR_CANCELLED;
 	}
-	if (FRS_add_linestyle_alpha_modifier(lineset->linestyle, type) < 0) {
+	if (FRS_add_linestyle_alpha_modifier(lineset->linestyle, type) == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Unknown alpha transparency modifier type");
 		return OPERATOR_CANCELLED;
 	}
@@ -954,7 +954,7 @@
 		BKE_report(op->reports, RPT_ERROR, "No active lineset and associated line style to add the modifier to");
 		return OPERATOR_CANCELLED;
 	}
-	if (FRS_add_linestyle_thickness_modifier(lineset->linestyle, type) < 0) {
+	if (FRS_add_linestyle_thickness_modifier(lineset->linestyle, type) == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Unknown line thickness modifier type");
 		return OPERATOR_CANCELLED;
 	}
@@ -993,7 +993,7 @@
 		BKE_report(op->reports, RPT_ERROR, "No active lineset and associated line style to add the modifier to");
 		return OPERATOR_CANCELLED;
 	}
-	if (FRS_add_linestyle_geometry_modifier(lineset->linestyle, type) < 0) {
+	if (FRS_add_linestyle_geometry_modifier(lineset->linestyle, type) == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "Unknown stroke geometry modifier type");
 		return OPERATOR_CANCELLED;
 	}

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp	2013-03-18 22:37:04 UTC (rev 55394)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp	2013-03-18 22:51:01 UTC (rev 55395)
@@ -58,8 +58,6 @@
 static double B2(double u);
 static double B3(double u);
 static Vector2 ComputeLeftTangent(Vector2 *d, int end);
-static Vector2 ComputeLeftTangent(Vector2 *d, int end);
-static Vector2 ComputeLeftTangent(Vector2 *d, int end);
 static double ComputeMaxError(Vector2 *d, int first, int last, BezierCurve bezCurve, double *u, int *splitPoint);
 static double *ChordLengthParameterize(Vector2 *d, int first, int last);
 static BezierCurve GenerateBezier(Vector2 *d, int first, int last, double *uPrime, Vector2 tHat1, Vector2 tHat2);