[Bf-blender-cvs] [5a93b1a51cf] soc-2019-outliner: Outliner: cleanup outliner selection syncing function name

Nathan Craddock noreply at git.blender.org
Tue Aug 6 05:01:19 CEST 2019


Commit: 5a93b1a51cff9bae3e3a3e9fc58bcae1964035e5
Author: Nathan Craddock
Date:   Mon Aug 5 21:00:22 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB5a93b1a51cff9bae3e3a3e9fc58bcae1964035e5

Outliner: cleanup outliner selection syncing function name

Cleanup function names for clarity

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

M	source/blender/editors/include/ED_outliner.h
M	source/blender/editors/space_outliner/outliner_edit.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_select.c
M	source/blender/editors/space_outliner/outliner_sync.c

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

diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h
index 46dbe2a1337..1bd0233c3ae 100644
--- a/source/blender/editors/include/ED_outliner.h
+++ b/source/blender/editors/include/ED_outliner.h
@@ -37,6 +37,8 @@ void ED_outliner_select_sync_from_edit_bone_tag(struct bContext *C);
 void ED_outliner_select_sync_from_pose_bone_tag(struct bContext *C);
 void ED_outliner_select_sync_from_sequence_tag(struct bContext *C);
 
+void ED_outliner_select_sync_from_outliner(struct bContext *C, struct SpaceOutliner *soops);
+
 bool ED_outliner_select_sync_is_dirty(const struct bContext *C);
 
 void ED_outliner_select_sync_flag_outliners(const struct bContext *C);
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 407c631552e..1fe2b4f0fce 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -1176,7 +1176,7 @@ static int outliner_select_all_exec(bContext *C, wmOperator *op)
   }
 
   if (soops->flag & SO_SYNC_SELECT) {
-    outliner_select_sync(C, soops);
+    ED_outliner_select_sync_from_outliner(C, soops);
   }
 
   DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index a28330e4282..2dc0276e9a3 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -487,7 +487,6 @@ void outliner_scroll_view(struct ARegion *ar, int delta_y);
 
 /* outliner_sync.c ---------------------------------------------- */
 
-void outliner_select_sync(struct bContext *C, struct SpaceOutliner *soops);
 void outliner_sync_selection(const struct bContext *C, struct SpaceOutliner *soops);
 
 #endif /* __OUTLINER_INTERN_H__ */
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 6911dc2359d..b98d96f6ef1 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -56,12 +56,13 @@
 #include "DEG_depsgraph_build.h"
 
 #include "ED_armature.h"
+#include "ED_gpencil.h"
 #include "ED_object.h"
+#include "ED_outliner.h"
 #include "ED_screen.h"
 #include "ED_select_utils.h"
 #include "ED_sequencer.h"
 #include "ED_undo.h"
-#include "ED_gpencil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -1404,7 +1405,7 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
     ED_undo_push(C, "Outliner selection change");
 
     if (soops->flag & SO_SYNC_SELECT) {
-      outliner_select_sync(C, soops);
+      ED_outliner_select_sync_from_outliner(C, soops);
     }
   }
 
@@ -1494,7 +1495,7 @@ static int outliner_box_select_exec(bContext *C, wmOperator *op)
   ED_region_tag_redraw(ar);
 
   if (soops->flag & SO_SYNC_SELECT) {
-    outliner_select_sync(C, soops);
+    ED_outliner_select_sync_from_outliner(C, soops);
   }
 
   return OPERATOR_FINISHED;
@@ -1785,7 +1786,7 @@ static int outliner_walk_select_invoke(bContext *C, wmOperator *op, const wmEven
   outliner_walk_scroll(ar, walk_element);
 
   if (soops->flag & SO_SYNC_SELECT) {
-    outliner_select_sync(C, soops);
+    ED_outliner_select_sync_from_outliner(C, soops);
   }
   ED_region_tag_redraw(ar);
 
diff --git a/source/blender/editors/space_outliner/outliner_sync.c b/source/blender/editors/space_outliner/outliner_sync.c
index b4121f451ed..13543e367d4 100644
--- a/source/blender/editors/space_outliner/outliner_sync.c
+++ b/source/blender/editors/space_outliner/outliner_sync.c
@@ -310,7 +310,7 @@ static void outliner_sync_selection_to_outliner(const bContext *C,
 }
 
 /* Set clean outliner and mark other outliners for syncing */
-void outliner_select_sync(bContext *C, SpaceOutliner *soops)
+void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *soops)
 {
   /* Don't sync in certain outliner display modes */
   if (ELEM(soops->outlinevis, SO_LIBRARIES, SO_DATA_API, SO_ID_ORPHANS)) {



More information about the Bf-blender-cvs mailing list