minor edits

- remove unneeded type check from convert grease pencil operator.
- correct some error prints & use __func__.
- make copy_libblock take an ID* argument rather than void*.

1 files changed, 6 insertions, 13 deletions

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d481be94bcc..7b79384fbb4 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -555,8 +555,8 @@ static void gp_layer_to_curve (bContext *C, bGPdata *gpd, bGPDlayer *gpl, short
 	 *	- must clear transforms set on object, as those skew our results
 	 */
 	ob= add_object(scene, OB_CURVE);
-	ob->loc[0]= ob->loc[1]= ob->loc[2]= 0;
-	ob->rot[0]= ob->rot[1]= ob->rot[2]= 0;
+	zero_v3(ob->loc);
+	zero_v3(ob->rot);
 	cu= ob->data;
 	cu->flag |= CU_3D;
 	
@@ -573,6 +573,9 @@ static void gp_layer_to_curve (bContext *C, bGPdata *gpd, bGPDlayer *gpl, short
 			case GP_STROKECONVERT_CURVE:
 				gp_stroke_to_bezier(C, gpl, gps, cu, subrect_ptr);
 				break;
+			default:
+				BLI_assert(!"invalid mode");
+				break;
 		}
 	}
 }
@@ -602,17 +605,7 @@ static int gp_convert_layer_exec (bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	/* handle conversion modes */
-	switch (mode) {
-		case GP_STROKECONVERT_PATH:
-		case GP_STROKECONVERT_CURVE:
-			gp_layer_to_curve(C, gpd, gpl, mode);
-			break;
-			
-		default: /* unsupoorted */
-			BKE_report(op->reports, RPT_ERROR, "Unknown conversion option");
-			return OPERATOR_CANCELLED;
-	}
+	gp_layer_to_curve(C, gpd, gpl, mode);
 
 	/* notifiers */
 	WM_event_add_notifier(C, NC_OBJECT|NA_ADDED, NULL);