Fix: all curves drawn cyclic if "cyclic" attribute exists #116638

Laurynas Duburas · 2023-12-29T21:30:44+01:00

Laurynas Duburas commented

2023-12-29 21:30:44 +01:00

All curves are drawn cyclic despite "Cyclic" state in redo panel if at least one was created cyclic.
First part of if's condition leads to it:

  if (attributes.contains("cyclic") || bool(calc_flag & CURVE_FIT_CALC_CYCLIC)) {
    curves.cyclic_for_write()[curve_index] = true;
  }

Also patch adds support of "Cyclic" in redo panel for "Poly" curves. It is ignored in "old curve" draw tool.

All curves are drawn cyclic despite "Cyclic" state in redo panel if at least one was created cyclic. First part of if's condition leads to it: ```c if (attributes.contains("cyclic") || bool(calc_flag & CURVE_FIT_CALC_CYCLIC)) { curves.cyclic_for_write()[curve_index] = true; } ``` Also patch adds support of "Cyclic" in redo panel for "Poly" curves. It is ignored in "old curve" draw tool.

Laurynas Duburas added 1 commit 2023-12-29 21:30:56 +01:00

Fix: all curves drawn cyclic if "cyclic" attribute exists c9fed69a30

All curves are drawn cyclic despite "Cyclic" state in redo panel if at least one was created cyclic.
Also adds support of "Cyclic" in redo panel for "Poly" curves.

Laurynas Duburas requested review from Hans Goudey 2023-12-29 21:31:30 +01:00

Hans Goudey reviewed 2023-12-30 15:28:42 +01:00

Hans Goudey left a comment

Thanks, makes sense! Just a couple tiny style comments.

source/blender/editors/curves/intern/curves_draw.cc

						
				@ -648,6 +648,7 @@ static int curves_draw_exec(bContext *C, wmOperator *op)

				  const float error_threshold = RNA_float_get(op->ptr, "error_threshold");

				  const float corner_angle = RNA_float_get(op->ptr, "corner_angle");

				  const bool use_cyclic = RNA_boolean_get(op->ptr, "use_cyclic");

				  bool is_cyclic = (stroke_len > 2) && use_cyclic;

Hans Goudey commented

2023-12-30 15:27:28 +01:00

bool -> const bool

`bool` -> `const bool`

Laurynas Duburas commented

2023-12-30 15:45:06 +01:00

It can change for Bezier. Look at your comment bellow and my code comment with a wrong style :)

Hans Goudey commented

2023-12-30 15:52:31 +01:00

Oops, my bad, haha

source/blender/editors/curves/intern/curves_draw.cc

						
				@ -725,6 +726,10 @@ static int curves_draw_exec(bContext *C, wmOperator *op)

				    if ((stroke_len > 2) && use_cyclic) {

				      calc_flag |= CURVE_FIT_CALC_CYCLIC;

				    }

				    // might happen after removing doubles