style cleanup: also quiet a warning.

1 files changed, 23 insertions, 17 deletions

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 770d621f2b5..26e9c845302 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -157,7 +157,7 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType *))
 		ot->name = N_("Dummy Name");
 	}
 
-	// XXX All ops should have a description but for now allow them not to.
+	/* XXX All ops should have a description but for now allow them not to. */
 	RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description : N_("(undocumented operator)"));
 	RNA_def_struct_identifier(ot->srna, ot->idname);
 
@@ -1646,8 +1646,8 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
 	else
 		G.f &= ~G_SCRIPT_AUTOEXEC;
 	
-	// XXX wm in context is not set correctly after WM_read_file -> crash
-	// do it before for now, but is this correct with multiple windows?
+	/* XXX wm in context is not set correctly after WM_read_file -> crash */
+	/* do it before for now, but is this correct with multiple windows? */
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	WM_read_file(C, path, op->reports);
@@ -1877,8 +1877,8 @@ static int wm_recover_last_session_exec(bContext *C, wmOperator *op)
 
 	G.fileflags |= G_FILE_RECOVER;
 
-	// XXX wm in context is not set correctly after WM_read_file -> crash
-	// do it before for now, but is this correct with multiple windows?
+	/* XXX wm in context is not set correctly after WM_read_file -> crash */
+	/* do it before for now, but is this correct with multiple windows? */
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	/* load file */
@@ -1909,8 +1909,8 @@ static int wm_recover_auto_save_exec(bContext *C, wmOperator *op)
 
 	G.fileflags |= G_FILE_RECOVER;
 
-	// XXX wm in context is not set correctly after WM_read_file -> crash
-	// do it before for now, but is this correct with multiple windows?
+	/* XXX wm in context is not set correctly after WM_read_file -> crash */
+	/* do it before for now, but is this correct with multiple windows? */
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	/* load file */
@@ -2218,7 +2218,7 @@ void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
 {
 	uiLayout *box, *row, *col, *sub, *split;
 
-	// Export Options:
+	/* Export Options: */
 	box = uiLayoutBox(layout);
 	row = uiLayoutRow(box, 0);
 	uiItemL(row, IFACE_("Export Data Options:"), ICON_MESH_DATA);
@@ -2251,7 +2251,7 @@ void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
 	row = uiLayoutRow(box, 0);
 	uiItemR(row, imfptr, "deform_bones_only", 0, NULL, ICON_NONE);
 
-	// Collada options:
+	/* Collada options: */
 	box = uiLayoutBox(layout);
 	row = uiLayoutRow(box, 0);
 	uiItemL(row, IFACE_("Collada Options:"), ICON_MODIFIER);
@@ -2275,6 +2275,12 @@ static void wm_collada_export_draw(bContext *UNUSED(C), wmOperator *op)
 
 static void WM_OT_collada_export(wmOperatorType *ot)
 {
+	static EnumPropertyItem prop_bc_export_mesh_type[] = {
+		{BC_MESH_TYPE_VIEW, "view", 0, "View", "Apply modifier's view settings"},
+		{BC_MESH_TYPE_RENDER, "render", 0, "Render", "Apply modifier's render settings"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	ot->name = "Export COLLADA";
 	ot->description = "Save a Collada file";
 	ot->idname = "WM_OT_collada_export";
@@ -2566,7 +2572,7 @@ int WM_border_select_modal(bContext *C, wmOperator *op, wmEvent *event)
 		}
 
 	}
-//	// Allow view navigation???
+//	/* Allow view navigation??? */
 //	else {
 //		return OPERATOR_PASS_THROUGH;
 //	}
@@ -2585,7 +2591,7 @@ int WM_border_select_cancel(bContext *C, wmOperator *op)
 /* works now only for selection or modal paint stuff, calls exec while hold mouse, exit on release */
 
 #ifdef GESTURE_MEMORY
-int circle_select_size = 25; // XXX - need some operator memory thing\!
+int circle_select_size = 25; /* XXX - need some operator memory thing! */
 #endif
 
 int WM_gesture_circle_invoke(bContext *C, wmOperator *op, wmEvent *event)
@@ -2668,7 +2674,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event)
 				return OPERATOR_FINISHED; /* use finish or we don't get an undo */
 		}
 	}
-//	// Allow view navigation???
+//	/* Allow view navigation??? */
 //	else {
 //		return OPERATOR_PASS_THROUGH;
 //	}
@@ -3798,14 +3804,14 @@ static void WM_OT_dependency_relations(wmOperatorType *ot)
 
 static int wm_ndof_sensitivity_exec(bContext *UNUSED(C), wmOperator *op)
 {
-	const float min = 0.25f, max = 4.f; // TODO: get these from RNA property
+	const float min = 0.25f, max = 4.0f; /* TODO: get these from RNA property */
 	float change;
 	float sensitivity = U.ndof_sensitivity;
 
 	if (RNA_boolean_get(op->ptr, "fast"))
-		change = 0.5f;  // 50% change
+		change = 0.5f;  /* 50% change */
 	else
-		change = 0.1f;  // 10%
+		change = 0.1f;  /* 10% */
 
 	if (RNA_boolean_get(op->ptr, "decrease")) {
 		sensitivity -= sensitivity * change; 
@@ -3931,7 +3937,7 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
 
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, 0, 0, GESTURE_MODAL_SELECT);
 
-#if 0 // Durien guys like this :S
+#if 0 /* Durien guys like this :S */
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, KM_SHIFT, 0, GESTURE_MODAL_DESELECT);
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_SHIFT, 0, GESTURE_MODAL_NOP);
 #else
@@ -4010,7 +4016,7 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf)
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, GESTURE_MODAL_SELECT);
 	WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_RELEASE, KM_ANY, 0, GESTURE_MODAL_SELECT);
 
-#if 0 // Durian guys like this
+#if 0 /* Durian guys like this */
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, KM_SHIFT, 0, GESTURE_MODAL_BEGIN);
 	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_SHIFT, 0, GESTURE_MODAL_DESELECT);
 #else