[Bf-blender-cvs] [9ebd309e2b9] blender2.8: GP: Change default parameters for convert curves.

[Antonioya]

Commit: 9ebd309e2b96c648ec17efd814d40f8e40f671fb
Author: Antonioya
Date:   Thu Dec 20 17:35:59 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB9ebd309e2b96c648ec17efd814d40f8e40f671fb

GP: Change default parameters for convert curves.

Now the link strokes is disabled by default.

Also some minor changes to adapt to new GP object.

===================================================================

M	source/blender/editors/gpencil/gpencil_convert.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c
index 9b13fb7d3ce..49ce18753b1 100644
--- a/source/blender/editors/gpencil/gpencil_convert.c
+++ b/source/blender/editors/gpencil/gpencil_convert.c
@@ -1312,14 +1312,18 @@ static void gp_convert_set_end_frame(struct Main *UNUSED(main), struct Scene *UN
 
 static bool gp_convert_poll(bContext *C)
 {
-	bGPdata *gpd = ED_gpencil_data_get_active(C);
+	Object *ob = CTX_data_active_object(C);
 	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	int cfra_eval = (int)DEG_get_ctime(depsgraph);
 
+	if ((ob == NULL) || (ob->type != OB_GPENCIL)) {
+		return false;
+	}
+
+	bGPdata *gpd = (bGPdata *)ob->data;
 	bGPDlayer *gpl = NULL;
 	bGPDframe *gpf = NULL;
 	ScrArea *sa = CTX_wm_area(C);
-	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	/* only if the current view is 3D View, if there's valid data (i.e. at least one stroke!),
 	 * and if we are not in edit mode!
@@ -1328,13 +1332,15 @@ static bool gp_convert_poll(bContext *C)
 	        (gpl = BKE_gpencil_layer_getactive(gpd)) &&
 	        (gpf = BKE_gpencil_layer_getframe(gpl, cfra_eval, GP_GETFRAME_USE_PREV)) &&
 	        (gpf->strokes.first) &&
-	        (OBEDIT_FROM_VIEW_LAYER(view_layer) == NULL));
+	        (!GPENCIL_ANY_EDIT_MODE(gpd)));
 }
 
 static int gp_convert_layer_exec(bContext *C, wmOperator *op)
 {
 	PropertyRNA *prop = RNA_struct_find_property(op->ptr, "use_timing_data");
-	bGPdata *gpd = ED_gpencil_data_get_active(C);
+	Object *ob = CTX_data_active_object(C);
+	bGPdata *gpd = (bGPdata *)ob->data;
+
 	bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
 	Scene *scene = CTX_data_scene(C);
 	const int mode = RNA_enum_get(op->ptr, "type");
@@ -1493,7 +1499,7 @@ void GPENCIL_OT_convert(wmOperatorType *ot)
 	                "Normalize weight (set from stroke width)");
 	RNA_def_float(ot->srna, "radius_multiplier", 1.0f, 0.0f, 1000.0f, "Radius Fac",
 	              "Multiplier for the points' radii (set from stroke width)", 0.0f, 10.0f);
-	RNA_def_boolean(ot->srna, "use_link_strokes", true, "Link Strokes",
+	RNA_def_boolean(ot->srna, "use_link_strokes", false, "Link Strokes",
 	                "Whether to link strokes with zero-radius sections of curves");
 
 	prop = RNA_def_enum(ot->srna, "timing_mode", prop_gpencil_convert_timingmodes, GP_STROKECONVERT_TIMING_FULL,