diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c index f322874428..8d25fa15cf 100644 --- a/app/core/gimpimage-item-list.c +++ b/app/core/gimpimage-item-list.c @@ -242,8 +242,7 @@ gimp_image_item_list_remove_children (GList *list, GList * gimp_image_item_list_filter (const GimpItem *exclude, GList *list, - gboolean remove_children, - gboolean remove_locked) + gboolean remove_children) { GList *l; @@ -270,20 +269,5 @@ gimp_image_item_list_filter (const GimpItem *exclude, } } - if (remove_locked) - { - l = list; - - while (l) - { - GimpItem *item = l->data; - - l = g_list_next (l); - - if (gimp_item_is_content_locked (item)) - list = g_list_remove (list, item); - } - } - return list; } diff --git a/app/core/gimpimage-item-list.h b/app/core/gimpimage-item-list.h index 591acf7322..b352505199 100644 --- a/app/core/gimpimage-item-list.h +++ b/app/core/gimpimage-item-list.h @@ -53,8 +53,7 @@ GList * gimp_image_item_list_get_list (const GimpImage *image, GList * gimp_image_item_list_filter (const GimpItem *exclude, GList *list, - gboolean remove_children, - gboolean remove_locked); + gboolean remove_children); #endif /* __GIMP_IMAGE_ITEM_LIST_H__ */ diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 792935c028..826b6d9fe3 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -1711,7 +1711,7 @@ gimp_image_estimate_memsize (const GimpImage *image, GIMP_ITEM_TYPE_CHANNELS, GIMP_ITEM_SET_ALL); - gimp_image_item_list_filter (NULL, drawables, TRUE, FALSE); + gimp_image_item_list_filter (NULL, drawables, TRUE); drawables = g_list_prepend (drawables, gimp_image_get_mask (image)); diff --git a/app/core/gimpitem-linked.c b/app/core/gimpitem-linked.c index e3db830fd1..7509c633f8 100644 --- a/app/core/gimpitem-linked.c +++ b/app/core/gimpitem-linked.c @@ -48,7 +48,7 @@ gimp_item_linked_is_locked (const GimpItem *item) GIMP_ITEM_TYPE_ALL, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); for (l = list; l && ! locked; l = g_list_next (l)) { @@ -87,7 +87,7 @@ gimp_item_linked_translate (GimpItem *item, GIMP_ITEM_TYPE_ALL, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); gimp_image_item_list_translate (gimp_item_get_image (item), list, offset_x, offset_y, push_undo); @@ -113,7 +113,7 @@ gimp_item_linked_flip (GimpItem *item, GIMP_ITEM_TYPE_ALL, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); gimp_image_item_list_flip (gimp_item_get_image (item), list, context, flip_type, axis, clip_result); @@ -141,7 +141,7 @@ gimp_item_linked_rotate (GimpItem *item, GIMP_ITEM_TYPE_VECTORS, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); gimp_image_item_list_rotate (gimp_item_get_image (item), list, context, rotate_type, center_x, center_y, clip_result); @@ -152,7 +152,7 @@ gimp_item_linked_rotate (GimpItem *item, GIMP_ITEM_TYPE_CHANNELS, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); gimp_image_item_list_rotate (gimp_item_get_image (item), list, context, rotate_type, center_x, center_y, TRUE); @@ -181,7 +181,7 @@ gimp_item_linked_transform (GimpItem *item, GIMP_ITEM_TYPE_ALL, GIMP_ITEM_SET_LINKED); - list = gimp_image_item_list_filter (item, list, TRUE, FALSE); + list = gimp_image_item_list_filter (item, list, TRUE); gimp_image_item_list_transform (gimp_item_get_image (item), list, context, matrix, direction, diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c index b9bb2f2fe1..dc1b31af15 100644 --- a/app/tools/gimpeditselectiontool.c +++ b/app/tools/gimpeditselectiontool.c @@ -355,8 +355,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool, GIMP_ITEM_TYPE_LAYERS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); /* Expand the rectangle to include all linked layers as well */ for (list = linked; list; list = g_list_next (list)) @@ -399,8 +398,7 @@ gimp_edit_selection_tool_start (GimpTool *parent_tool, GIMP_ITEM_TYPE_VECTORS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); for (list = linked; list; list = g_list_next (list)) { @@ -532,8 +530,7 @@ gimp_edit_selection_tool_button_release (GimpTool *tool, GIMP_ITEM_TYPE_CHANNELS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); gimp_image_item_list_translate (image, linked, @@ -665,8 +662,7 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select, GIMP_ITEM_TYPE_VECTORS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); gimp_image_item_list_translate (image, linked, @@ -879,8 +875,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool) GIMP_ITEM_TYPE_LAYERS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); for (list = linked; list; list = g_list_next (list)) { @@ -929,8 +924,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool) GIMP_ITEM_TYPE_VECTORS, GIMP_ITEM_SET_LINKED); - linked = gimp_image_item_list_filter (active_item, linked, - TRUE, FALSE); + linked = gimp_image_item_list_filter (active_item, linked, TRUE); for (list = linked; list; list = g_list_next (list)) {