Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop

1 files changed, 168 insertions, 126 deletions

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index b70468dd508..3e28b5ee20c 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -464,8 +464,8 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
 	}
 
 	return template_common_search_menu(
-	               C, ar, id_search_cb_p, &template_ui, template_ID_set_property_cb, active_item_ptr.data,
-	               template_ui.prv_rows, template_ui.prv_cols);
+	        C, ar, id_search_cb_p, &template_ui, template_ID_set_property_cb, active_item_ptr.data,
+	        template_ui.prv_rows, template_ui.prv_cols);
 }
 
 /************************ ID Template ***************************/
@@ -575,8 +575,9 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 			break;
 		case UI_ID_ALONE:
 			if (id) {
-				const bool do_scene_obj = (GS(id->name) == ID_OB) &&
-				                          (template_ui->ptr.type == &RNA_SceneObjects);
+				const bool do_scene_obj = (
+				        (GS(id->name) == ID_OB) &&
+				        (template_ui->ptr.type == &RNA_SceneObjects));
 
 				/* make copy */
 				if (do_scene_obj) {
@@ -667,43 +668,49 @@ static uiBut *template_id_def_new_but(
 	const int but_type = use_tab_but ? UI_BTYPE_TAB : UI_BTYPE_BUT;
 
 	/* i18n markup, does nothing! */
-	BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_DEFAULT,
-	                                 BLT_I18NCONTEXT_ID_SCENE,
-	                                 BLT_I18NCONTEXT_ID_OBJECT,
-	                                 BLT_I18NCONTEXT_ID_MESH,
-	                                 BLT_I18NCONTEXT_ID_CURVE,
-	                                 BLT_I18NCONTEXT_ID_METABALL,
-	                                 BLT_I18NCONTEXT_ID_MATERIAL,
-	                                 BLT_I18NCONTEXT_ID_TEXTURE,
-	                                 BLT_I18NCONTEXT_ID_IMAGE,
-	                                 BLT_I18NCONTEXT_ID_LATTICE,
-	                                 BLT_I18NCONTEXT_ID_LAMP,
-	                                 BLT_I18NCONTEXT_ID_CAMERA,
-	                                 BLT_I18NCONTEXT_ID_WORLD,
-	                                 BLT_I18NCONTEXT_ID_SCREEN,
-	                                 BLT_I18NCONTEXT_ID_TEXT,
+	BLT_I18N_MSGID_MULTI_CTXT(
+	        "New",
+	        BLT_I18NCONTEXT_DEFAULT,
+	        BLT_I18NCONTEXT_ID_SCENE,
+	        BLT_I18NCONTEXT_ID_OBJECT,
+	        BLT_I18NCONTEXT_ID_MESH,
+	        BLT_I18NCONTEXT_ID_CURVE,
+	        BLT_I18NCONTEXT_ID_METABALL,
+	        BLT_I18NCONTEXT_ID_MATERIAL,
+	        BLT_I18NCONTEXT_ID_TEXTURE,
+	        BLT_I18NCONTEXT_ID_IMAGE,
+	        BLT_I18NCONTEXT_ID_LATTICE,
+	        BLT_I18NCONTEXT_ID_LAMP,
+	        BLT_I18NCONTEXT_ID_CAMERA,
+	        BLT_I18NCONTEXT_ID_WORLD,
+	        BLT_I18NCONTEXT_ID_SCREEN,
+	        BLT_I18NCONTEXT_ID_TEXT,
 	);
-	BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_ID_SPEAKER,
-	                                 BLT_I18NCONTEXT_ID_SOUND,
-	                                 BLT_I18NCONTEXT_ID_ARMATURE,
-	                                 BLT_I18NCONTEXT_ID_ACTION,
-	                                 BLT_I18NCONTEXT_ID_NODETREE,
-	                                 BLT_I18NCONTEXT_ID_BRUSH,
-	                                 BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
-	                                 BLT_I18NCONTEXT_ID_GPENCIL,
-	                                 BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
-	                                 BLT_I18NCONTEXT_ID_WORKSPACE,
-	                                 BLT_I18NCONTEXT_ID_LIGHTPROBE,
+	BLT_I18N_MSGID_MULTI_CTXT(
+	        "New",
+	        BLT_I18NCONTEXT_ID_SPEAKER,
+	        BLT_I18NCONTEXT_ID_SOUND,
+	        BLT_I18NCONTEXT_ID_ARMATURE,
+	        BLT_I18NCONTEXT_ID_ACTION,
+	        BLT_I18NCONTEXT_ID_NODETREE,
+	        BLT_I18NCONTEXT_ID_BRUSH,
+	        BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
+	        BLT_I18NCONTEXT_ID_GPENCIL,
+	        BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
+	        BLT_I18NCONTEXT_ID_WORKSPACE,
+	        BLT_I18NCONTEXT_ID_LIGHTPROBE,
 	);
 
 	if (newop) {
-		but = uiDefIconTextButO(block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN,
-		                        (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL);
+		but = uiDefIconTextButO(
+		        block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN,
+		        (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL);
 		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 	}
 	else {
-		but = uiDefIconTextBut(block, but_type, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
-		                       0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL);
+		but = uiDefIconTextBut(
+		        block, but_type, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
+		        0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL);
 		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ADD_NEW));
 	}
 
@@ -763,17 +770,20 @@ static void template_ID(
 
 		if (id->lib) {
 			if (id->tag & LIB_TAG_INDIRECT) {
-				but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_INDIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                   NULL, 0, 0, 0, 0, TIP_("Indirect library data-block, cannot change"));
+				but = uiDefIconBut(
+				        block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_INDIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
+				        NULL, 0, 0, 0, 0, TIP_("Indirect library data-block, cannot change"));
 				UI_but_flag_enable(but, UI_BUT_DISABLED);
 			}
 			else {
-				const bool disabled = (!id_make_local(CTX_data_main(C), id, true /* test */, false) ||
-				                       (idfrom && idfrom->lib));
-				but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
-				                   NULL, 0, 0, 0, 0,
-				                   TIP_("Direct linked library data-block, click to make local, "
-				                        "Shift + Click to create a static override"));
+				const bool disabled = (
+				        !id_make_local(CTX_data_main(C), id, true /* test */, false) ||
+				        (idfrom && idfrom->lib));
+				but = uiDefIconBut(
+				        block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y,
+				        NULL, 0, 0, 0, 0,
+				        TIP_("Direct linked library data-block, click to make local, "
+				             "Shift + Click to create a static override"));
 				if (disabled) {
 					UI_but_flag_enable(but, UI_BUT_DISABLED);
 				}
@@ -783,9 +793,10 @@ static void template_ID(
 			}
 		}
 		else if (ID_IS_STATIC_OVERRIDE(id)) {
-			but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_OVERRIDE, 0, 0, UI_UNIT_X, UI_UNIT_Y,
-			                   NULL, 0, 0, 0, 0,
-			                   TIP_("Static override of linked library data-block, click to make fully local"));
+			but = uiDefIconBut(
+			        block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_OVERRIDE, 0, 0, UI_UNIT_X, UI_UNIT_Y,
+			        NULL, 0, 0, 0, 0,
+			        TIP_("Static override of linked library data-block, click to make fully local"));
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_OVERRIDE));
 		}
 
@@ -795,9 +806,10 @@ static void template_ID(
 
 			numstr_len = BLI_snprintf(numstr, sizeof(numstr), "%d", id->us);
 
-			but = uiDefBut(block, UI_BTYPE_BUT, 0, numstr, 0, 0,
-			               numstr_len * 0.2f * UI_UNIT_X + UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
-			               TIP_("Display number of users of this data (click to make a single-user copy)"));
+			but = uiDefBut(
+			        block, UI_BTYPE_BUT, 0, numstr, 0, 0,
+			        numstr_len * 0.2f * UI_UNIT_X + UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
+			        TIP_("Display number of users of this data (click to make a single-user copy)"));
 			but->flag |= UI_BUT_UNDO;
 
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_ALONE));
@@ -826,8 +838,9 @@ static void template_ID(
 	/* Due to space limit in UI - skip the "open" icon for packed data, and allow to unpack.
 	 * Only for images, sound and fonts */
 	if (id && BKE_pack_check(id)) {
-		but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_unpack_item", WM_OP_INVOKE_REGION_WIN, ICON_PACKAGE, 0, 0,
-		                    UI_UNIT_X, UI_UNIT_Y, TIP_("Packed File, click to unpack"));
+		but = uiDefIconButO(
+		        block, UI_BTYPE_BUT, "FILE_OT_unpack_item", WM_OP_INVOKE_REGION_WIN, ICON_PACKAGE, 0, 0,
+		        UI_UNIT_X, UI_UNIT_Y, TIP_("Packed File, click to unpack"));
 		UI_but_operator_ptr_get(but);
 
 		RNA_string_set(but->opptr, "id_name", id->name + 2);
@@ -838,13 +851,15 @@ static void template_ID(
 		int w = id ? UI_UNIT_X : (flag & UI_ID_ADD_NEW) ? UI_UNIT_X * 3 : UI_UNIT_X * 6;
 
 		if (openop) {
-			but = uiDefIconTextButO(block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id) ? "" : IFACE_("Open"),
-			                        0, 0, w, UI_UNIT_Y, NULL);
+			but = uiDefIconTextButO(
+			        block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id) ? "" : IFACE_("Open"),
+			        0, 0, w, UI_UNIT_Y, NULL);
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_OPEN));
 		}
 		else {
-			but = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_FILESEL, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y,
-			                       NULL, 0, 0, 0, 0, NULL);
+			but = uiDefIconTextBut(
+			        block, UI_BTYPE_BUT, 0, ICON_FILESEL, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y,
+			        NULL, 0, 0, 0, 0, NULL);
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_OPEN));
 		}
 
@@ -865,9 +880,10 @@ static void template_ID(
 		}
 		else {
 			if ((RNA_property_flag(template_ui->prop) & PROP_NEVER_UNLINK) == 0) {
-				but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
-				                   TIP_("Unlink data-block "
-				                        "(Shift + Click to set users to zero, data will then not be saved)"));
+				but = uiDefIconBut(
+				        block, UI_BTYPE_BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
+				        TIP_("Unlink data-block "
+				             "(Shift + Click to set users to zero, data will then not be saved)"));
 				UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), SET_INT_IN_POINTER(UI_ID_DELETE));
 
 				if (RNA_property_flag(template_ui->prop) & PROP_NEVER_NULL) {
@@ -1110,13 +1126,14 @@ static uiBlock *template_search_menu(bContext *C, ARegion *region, void *arg_tem
 
 	/* arg_template is malloced, can be freed by parent button */
 	template_search = *((TemplateSearch *)arg_template);
-	active_ptr = RNA_property_pointer_get(&template_search.search_data.target_ptr,
-	                                      template_search.search_data.target_prop);
+	active_ptr = RNA_property_pointer_get(
+	        &template_search.search_data.target_ptr,
+	        template_search.search_data.target_prop);
 
 	return template_common_search_menu(
-	               C, region, ui_rna_collection_search_cb, &template_search,
-	               template_search_handle_cb, active_ptr.data,
-	               template_search.preview_rows, template_search.preview_cols);
+	        C, region, ui_rna_collection_search_cb, &template_search,
+	        template_search_handle_cb, active_ptr.data,
+	        template_search.preview_rows, template_search.preview_cols);
 }
 
 static void template_search_add_button_searchmenu(
@@ -1295,8 +1312,9 @@ void uiTemplateSearchPreview(
  * - propname: property identifier for property that path gets stored to
  * - root_ptr: struct that path gets built from
  */
-void uiTemplatePathBuilder(uiLayout *layout, PointerRNA *ptr, const char *propname, PointerRNA *UNUSED(root_ptr),
-                           const char *text)
+void uiTemplatePathBuilder(
+        uiLayout *layout, PointerRNA *ptr, const char *propname, PointerRNA *UNUSED(root_ptr),
+        const char *text)
 {
 	PropertyRNA *propPath;
 	uiLayout *row;
@@ -1401,8 +1419,9 @@ static uiLayout *draw_modifier(
 		BLI_snprintf(str, sizeof(str), IFACE_("%s parent deform"), md->name);
 		uiDefBut(block, UI_BTYPE_LABEL, 0, str, 0, 0, 185, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Modifier name"));
 
-		but = uiDefBut(block, UI_BTYPE_BUT, 0, IFACE_("Make Real"), 0, 0, 80, 16, NULL, 0.0, 0.0, 0.0, 0.0,
-		               TIP_("Convert virtual modifier to a real modifier"));
+		but = uiDefBut(
+		        block, UI_BTYPE_BUT, 0, IFACE_("Make Real"), 0, 0, 80, 16, NULL, 0.0, 0.0, 0.0, 0.0,
+		        TIP_("Convert virtual modifier to a real modifier"));
 		UI_but_func_set(but, modifiers_convertToReal, ob, md);
 	}
 	else {
@@ -1457,9 +1476,10 @@ static uiLayout *draw_modifier(
 			if (ELEM(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
 				/* add disabled pre-tessellated button, so users could have
 				 * message for this modifiers */
-				but = uiDefIconButBitI(block, UI_BTYPE_TOGGLE, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0,
-				                       UI_UNIT_X - 2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0,
-				                       TIP_("This modifier can only be applied on splines' points"));
+				but = uiDefIconButBitI(
+				        block, UI_BTYPE_TOGGLE, eModifierMode_ApplyOnSpline, 0, ICON_SURFACE_DATA, 0, 0,
+				        UI_UNIT_X - 2, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0,
+				        TIP_("This modifier can only be applied on splines' points"));
 				UI_but_flag_enable(but, UI_BUT_DISABLED);
 			}
 			else if (mti->type != eModifierTypeType_Constructive) {
@@ -1517,13 +1537,15 @@ static uiLayout *draw_modifier(
 			}
 			else {
 				uiLayoutSetOperatorContext(row, WM_OP_INVOKE_DEFAULT);
-				uiItemEnumO(row, "OBJECT_OT_modifier_apply", CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply"),
-				            0, "apply_as", MODIFIER_APPLY_DATA);
+				uiItemEnumO(
+				        row, "OBJECT_OT_modifier_apply", CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply"),
+				        0, "apply_as", MODIFIER_APPLY_DATA);
 
 				if (modifier_isSameTopology(md) && !modifier_isNonGeometrical(md)) {
-					uiItemEnumO(row, "OBJECT_OT_modifier_apply",
-					            CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply as Shape Key"),
-					            0, "apply_as", MODIFIER_APPLY_SHAPE);
+					uiItemEnumO(
+					        row, "OBJECT_OT_modifier_apply",
+					        CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply as Shape Key"),
+					        0, "apply_as", MODIFIER_APPLY_SHAPE);
 				}
 			}
 
@@ -1902,7 +1924,7 @@ static void do_preview_buttons(bContext *C, void *arg, int event)
 }
 
 void uiTemplatePreview(
-        uiLayout *layout, bContext *C, ID *id, int show_buttons, ID *parent, MTex *slot,
+        uiLayout *layout, bContext *C, ID *id, bool show_buttons, ID *parent, MTex *slot,
         const char *preview_id)
 {
 	uiLayout *row, *col;
@@ -1981,8 +2003,9 @@ void uiTemplatePreview(
 	UI_but_func_drawextra_set(block, ED_preview_draw, pparent, slot);
 	UI_block_func_handle_set(block, do_preview_buttons, NULL);
 
-	uiDefIconButS(block, UI_BTYPE_GRIP, 0, ICON_GRIP, 0, 0, UI_UNIT_X * 10, (short)(UI_UNIT_Y * 0.3f), &ui_preview->height,
-	              UI_UNIT_Y, UI_UNIT_Y * 50.0f, 0.0f, 0.0f, "");
+	uiDefIconButS(
+	        block, UI_BTYPE_GRIP, 0, ICON_GRIP, 0, 0, UI_UNIT_X * 10, (short)(UI_UNIT_Y * 0.3f), &ui_preview->height,
+	        UI_UNIT_Y, UI_UNIT_Y * 50.0f, 0.0f, 0.0f, "");
 
 	/* add buttons */
 	if (pid && show_buttons) {
@@ -2130,17 +2153,20 @@ static void colorband_buttons_layout(
 	UI_block_align_begin(block);
 	row = uiLayoutRow(split, false);
 
-	bt = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_ZOOMIN, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL,
-	                      0, 0, 0, 0, TIP_("Add a new color stop to the colorband"));
+	bt = uiDefIconTextBut(
+	        block, UI_BTYPE_BUT, 0, ICON_ZOOMIN, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL,
+	        0, 0, 0, 0, TIP_("Add a new color stop to the colorband"));
 
 	UI_but_funcN_set(bt, colorband_add_cb, MEM_dupallocN(cb), coba);
 
-	bt = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_ZOOMOUT, "", xs +  2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
-	              NULL, 0, 0, 0, 0, TIP_("Delete the active position"));
+	bt = uiDefIconTextBut(
+	        block, UI_BTYPE_BUT, 0, ICON_ZOOMOUT, "", xs +  2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
+	        NULL, 0, 0, 0, 0, TIP_("Delete the active position"));
 	UI_but_funcN_set(bt, colorband_del_cb, MEM_dupallocN(cb), coba);
 
-	bt = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_ARROW_LEFTRIGHT, "", xs + 4.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
-	              NULL, 0, 0, 0, 0, TIP_("Flip the color ramp"));
+	bt = uiDefIconTextBut(
+	        block, UI_BTYPE_BUT, 0, ICON_ARROW_LEFTRIGHT, "", xs + 4.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
+	        NULL, 0, 0, 0, 0, TIP_("Flip the color ramp"));
 	UI_but_funcN_set(bt, colorband_flip_cb, MEM_dupallocN(cb), coba);
 
 	bt = uiDefIconButO(block, UI_BTYPE_BUT, "UI_OT_eyedropper_colorband", WM_OP_INVOKE_DEFAULT, ICON_EYEDROPPER, xs + 6.0f * unit, ys + UI_UNIT_Y, UI_UNIT_X, UI_UNIT_Y, NULL);
@@ -2212,7 +2238,7 @@ static void colorband_buttons_layout(
 	}
 }
 
-void uiTemplateColorRamp(uiLayout *layout, PointerRNA *ptr, const char *propname, int expand)
+void uiTemplateColorRamp(uiLayout *layout, PointerRNA *ptr, const char *propname, bool expand)
 {
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
 	PointerRNA cptr;
@@ -2325,7 +2351,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem)
 /**
  * \param icon_scale: Scale of the icon, 1x == button height.
  */
-void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname, int show_labels, float icon_scale)
+void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname, bool show_labels, float icon_scale)
 {
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
 	IconViewMenuArgs *cb_args;
@@ -2561,8 +2587,9 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *ar, void *cumap_v)
 	/* use this for a fake extra empy space around the buttons */
 	uiDefBut(block, UI_BTYPE_LABEL, 0, "",           -4, 16, width + 8, 6 * UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
 
-	bt = uiDefButBitI(block, UI_BTYPE_TOGGLE, CUMA_DO_CLIP, 1, IFACE_("Use Clipping"),
-	                  0, 5 * UI_UNIT_Y, width, UI_UNIT_Y, &cumap->flag, 0.0, 0.0, 10, 0, "");
+	bt = uiDefButBitI(
+	        block, UI_BTYPE_TOGGLE, CUMA_DO_CLIP, 1, IFACE_("Use Clipping"),
+	        0, 5 * UI_UNIT_Y, width, UI_UNIT_Y, &cumap->flag, 0.0, 0.0, 10, 0, "");
 	UI_but_func_set(bt, curvemap_buttons_setclip, cumap, NULL);
 
 	UI_block_align_begin(block);
@@ -2725,8 +2752,8 @@ static void curvemap_buttons_reset(bContext *C, void *cb_v, void *cumap_v)
 
 /* still unsure how this call evolves... we use labeltype for defining what curve-channels to show */
 static void curvemap_buttons_layout(
-        uiLayout *layout, PointerRNA *ptr, char labeltype, int levels,
-        int brush, int neg_slope, RNAUpdateCb *cb)
+        uiLayout *layout, PointerRNA *ptr, char labeltype, bool levels,
+        bool brush, bool neg_slope, RNAUpdateCb *cb)
 {
 	CurveMapping *cumap = ptr->data;
 	CurveMap *cm = &cumap->cm[cumap->cur];
@@ -2821,11 +2848,13 @@ static void curvemap_buttons_layout(
 	if (brush)
 		bt = uiDefIconBlockBut(block, curvemap_brush_tools_func, cumap, 0, ICON_MODIFIER, 0, 0, dx, dx, TIP_("Tools"));
 	else if (neg_slope)
-		bt = uiDefIconBlockBut(block, curvemap_tools_negslope_func, cumap, 0, ICON_MODIFIER,
-		                       0, 0, dx, dx, TIP_("Tools"));
+		bt = uiDefIconBlockBut(
+		        block, curvemap_tools_negslope_func, cumap, 0, ICON_MODIFIER,
+		        0, 0, dx, dx, TIP_("Tools"));
 	else
-		bt = uiDefIconBlockBut(block, curvemap_tools_posslope_func, cumap, 0, ICON_MODIFIER,
-		                       0, 0, dx, dx, TIP_("Tools"));
+		bt = uiDefIconBlockBut(
+		        block, curvemap_tools_posslope_func, cumap, 0, ICON_MODIFIER,
+		        0, 0, dx, dx, TIP_("Tools"));
 
 	UI_but_funcN_set(bt, rna_update_cb, MEM_dupallocN(cb), NULL);
 
@@ -2889,7 +2918,7 @@ static void curvemap_buttons_layout(
 
 void uiTemplateCurveMapping(
         uiLayout *layout, PointerRNA *ptr, const char *propname, int type,
-        int levels, int brush, int neg_slope)
+        bool levels, bool brush, bool neg_slope)
 {
 	RNAUpdateCb *cb;
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
@@ -2933,8 +2962,8 @@ void uiTemplateCurveMapping(
 
 /* This template now follows User Preference for type - name is not correct anymore... */
 void uiTemplateColorPicker(
-        uiLayout *layout, PointerRNA *ptr, const char *propname, int value_slider,
-        int lock, int lock_luminosity, int cubic)
+        uiLayout *layout, PointerRNA *ptr, const char *propname, bool value_slider,
+        bool lock, bool lock_luminosity, bool cubic)
 {
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
 	uiBlock *block = uiLayoutGetBlock(layout);
@@ -2955,24 +2984,28 @@ void uiTemplateColorPicker(
 
 	switch (U.color_picker_type) {
 		case USER_CP_SQUARE_SV:
-			but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-			                     -1, 0.0, 0.0, UI_GRAD_SV, 0, "");
+			but = uiDefButR_prop(
+			        block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
+			        -1, 0.0, 0.0, UI_GRAD_SV, 0, "");
 			break;
 		case USER_CP_SQUARE_HS:
-			but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-			                     -1, 0.0, 0.0, UI_GRAD_HS, 0, "");
+			but = uiDefButR_prop(
+			        block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
+			        -1, 0.0, 0.0, UI_GRAD_HS, 0, "");
 			break;
 		case USER_CP_SQUARE_HV:
-			but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-			                     -1, 0.0, 0.0, UI_GRAD_HV, 0, "");
+			but = uiDefButR_prop(
+			        block, UI_BTYPE_HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
+			        -1, 0.0, 0.0, UI_GRAD_HV, 0, "");
 			break;
 
 		/* user default */
 		case USER_CP_CIRCLE_HSV:
 		case USER_CP_CIRCLE_HSL:
 		default:
-			but = uiDefButR_prop(block, UI_BTYPE_HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-			                     -1, 0.0, 0.0, 0, 0, "");
+			but = uiDefButR_prop(
+			        block, UI_BTYPE_HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
+			        -1, 0.0, 0.0, 0, 0, "");
 			break;
 
 	}
@@ -2998,31 +3031,36 @@ void uiTemplateColorPicker(
 		switch (U.color_picker_type) {
 			case USER_CP_CIRCLE_HSL:
 				uiItemS(row);
-				but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
-				                     -1, softmin, softmax, UI_GRAD_L_ALT, 0, "");
+				but = uiDefButR_prop(
+				        block, UI_BTYPE_HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
+				        -1, softmin, softmax, UI_GRAD_L_ALT, 0, "");
 				break;
 			case USER_CP_SQUARE_SV:
 				uiItemS(col);
-				but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
-				                     -1, softmin, softmax, UI_GRAD_SV + 3, 0, "");
+				but = uiDefButR_prop(
+				        block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
+				        -1, softmin, softmax, UI_GRAD_SV + 3, 0, "");
 				break;
 			case USER_CP_SQUARE_HS:
 				uiItemS(col);
-				but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
-				                     -1, softmin, softmax, UI_GRAD_HS + 3, 0, "");
+				but = uiDefButR_prop(
+				        block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
+				        -1, softmin, softmax, UI_GRAD_HS + 3, 0, "");
 				break;
 			case USER_CP_SQUARE_HV:
 				uiItemS(col);
-				but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
-				                     -1, softmin, softmax, UI_GRAD_HV + 3, 0, "");
+				but = uiDefButR_prop(
+				        block, UI_BTYPE_HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop,
+				        -1, softmin, softmax, UI_GRAD_HV + 3, 0, "");
 				break;
 
 			/* user default */
 			case USER_CP_CIRCLE_HSV:
 			default:
 				uiItemS(row);
-				but = uiDefButR_prop(block, UI_BTYPE_HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
-				                     -1, softmin, softmax, UI_GRAD_V_ALT, 0, "");
+				but = uiDefButR_prop(
+				        block, UI_BTYPE_HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
+				        -1, softmin, softmax, UI_GRAD_V_ALT, 0, "");
 				break;
 		}
 
@@ -3030,7 +3068,7 @@ void uiTemplateColorPicker(
 	}
 }
 
-void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname, int UNUSED(colors))
+void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname, bool UNUSED(colors))
 {
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
 	PointerRNA cptr;
@@ -3073,8 +3111,9 @@ void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname,
 		}
 
 		RNA_pointer_create(&palette->id, &RNA_PaletteColor, color, &color_ptr);
-		uiDefButR(block, UI_BTYPE_COLOR, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, &color_ptr, "color", -1, 0.0, 1.0,
-		          UI_PALETTE_COLOR, col_id, "");
+		uiDefButR(
+		        block, UI_BTYPE_COLOR, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, &color_ptr, "color", -1, 0.0, 1.0,
+		        UI_PALETTE_COLOR, col_id, "");
 		row_cols++;
 		col_id++;
 	}
@@ -3235,8 +3274,9 @@ static int cmpstringp(const void *p1, const void *p2)
 	return BLI_strcasecmp(((StringCmp *) p1)->name, ((StringCmp *) p2)->name);
 }
 
-static void uilist_filter_items_default(struct uiList *ui_list, struct bContext *UNUSED(C), struct PointerRNA *dataptr,
-                                        const char *propname)
+static void uilist_filter_items_default(
+        struct uiList *ui_list, struct bContext *UNUSED(C), struct PointerRNA *dataptr,
+        const char *propname)
 {
 	uiListDyn *dyn_data = ui_list->dyn_data;
 	PropertyRNA *prop = RNA_struct_find_property(dataptr, propname);
@@ -3678,9 +3718,10 @@ void uiTemplateList(
 					/* list item behind label & other buttons */
 					sub = uiLayoutRow(overlap, false);
 
-					but = uiDefButR_prop(subblock, UI_BTYPE_LISTROW, 0, "", 0, 0, UI_UNIT_X * 10, UI_UNIT_Y,
-					                     active_dataptr, activeprop, 0, 0, org_i, 0, 0,
-					                     TIP_("Double click to rename"));
+					but = uiDefButR_prop(
+					        subblock, UI_BTYPE_LISTROW, 0, "", 0, 0, UI_UNIT_X * 10, UI_UNIT_Y,
+					        active_dataptr, activeprop, 0, 0, org_i, 0, 0,
+					        TIP_("Double click to rename"));
 					if ((dyntip_data = uilist_item_use_dynamic_tooltip(itemptr, item_dyntip_propname))) {
 						UI_but_func_tooltip_set(but, uilist_item_tooltip_func, dyntip_data);
 					}
@@ -3736,8 +3777,9 @@ void uiTemplateList(
 
 			/* next/prev button */
 			BLI_snprintf(numstr, sizeof(numstr), "%d :", dyn_data->items_shown);
-			but = uiDefIconTextButR_prop(block, UI_BTYPE_NUM, 0, 0, numstr, 0, 0, UI_UNIT_X * 5, UI_UNIT_Y,
-			                             active_dataptr, activeprop, 0, 0, 0, 0, 0, "");
+			but = uiDefIconTextButR_prop(
+			        block, UI_BTYPE_NUM, 0, 0, numstr, 0, 0, UI_UNIT_X * 5, UI_UNIT_Y,
+			        active_dataptr, activeprop, 0, 0, 0, 0, 0, "");
 			if (dyn_data->items_shown == 0)
 				UI_but_flag_enable(but, UI_BUT_DISABLED);
 			break;
@@ -4380,12 +4422,12 @@ void uiTemplateInputStatus(uiLayout *layout, struct bContext *C)
 		uiItemL(row, msg ? msg : "", (ICON_MOUSE_LMB + i));
 
 		if (msg_drag) {
-			uiItemL(row, msg_drag, ICON_MOUSE_DRAG);
+			uiItemL(row, msg_drag, (ICON_MOUSE_LMB_DRAG + i));
 		}
 
 		/* Use trick with empty string to keep icons in same position. */
 		row = uiLayoutRow(col, false);
-		uiItemL(row, "                                                        ", ICON_NONE);
+		uiItemL(row, "                                                                   ", ICON_NONE);
 	}
 }