fix for some errors.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 22:51:01 +0000 (22:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 22:51:01 +0000 (22:51 +0000)
source/blender/editors/render/render_shading.c
source/blender/freestyle/intern/geometry/FitCurve.cpp

index 68766591788162dfdbd3e5301448baf62fd9ad59..174343ff0ad6c1249ef381fb65a1ef9372744186 100644 (file)
@@ -876,7 +876,7 @@ static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op)
                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 @@ static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op)
                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 @@ static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op)
                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 @@ static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op)
                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;
        }
index cb338be8cf312bc86b36cbf3a7d5ab5691cfbac8..73816cc687f7663a90fbce67584bfddc0d2d297b 100644 (file)
@@ -58,8 +58,6 @@ static double B1(double u);
 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);