[Bf-blender-cvs] [4350ea4ecd1] soc-2020-outliner: Outliner: Simplify collection drop tooltip

Nathan Craddock noreply at git.blender.org
Sat Aug 15 00:46:37 CEST 2020


Commit: 4350ea4ecd165d94ccde2bb227a1063ec34751ee
Author: Nathan Craddock
Date:   Fri Aug 14 16:27:12 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB4350ea4ecd165d94ccde2bb227a1063ec34751ee

Outliner: Simplify collection drop tooltip

Rather than specifying after/before/between for collection reorder, just
use "Reorder collection(s)" similar to object reorder.

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

M	source/blender/editors/space_outliner/outliner_dragdrop.c

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

diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c
index e533a7e0aa2..b78b3a8cb78 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -1201,22 +1201,12 @@ static bool collection_drop_poll(bContext *C,
         case TE_INSERT_BEFORE:
           tselem->flag |= TSE_DRAG_BEFORE;
           changed = true;
-          if (te->prev && outliner_is_collection_tree_element(te->prev)) {
-            *r_tooltip = TIP_("Move between collections");
-          }
-          else {
-            *r_tooltip = TIP_("Move before collection");
-          }
+          *r_tooltip = TIP_("Reorder collection(s)");
           break;
         case TE_INSERT_AFTER:
           tselem->flag |= TSE_DRAG_AFTER;
           changed = true;
-          if (te->next && outliner_is_collection_tree_element(te->next)) {
-            *r_tooltip = TIP_("Move between collections");
-          }
-          else {
-            *r_tooltip = TIP_("Move after collection");
-          }
+          *r_tooltip = TIP_("Reorder collection(s)");
           break;
         case TE_INSERT_INTO:
           tselem->flag |= TSE_DRAG_INTO;



More information about the Bf-blender-cvs mailing list