[Bf-blender-cvs] [43d04c7eeb8] master: UI Code Quality: Move eyedropper files to own folder

[Julian Eisel]

Commit: 43d04c7eeb8a3ec50b1c022522fb8fa6b42a883c
Author: Julian Eisel
Date:   Tue Jul 19 19:31:26 2022 +0200
Branches: master
https://developer.blender.org/rB43d04c7eeb8a3ec50b1c022522fb8fa6b42a883c

UI Code Quality: Move eyedropper files to own folder

Part of T98518

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

M	source/blender/editors/interface/CMakeLists.txt
R099	source/blender/editors/interface/interface_eyedropper_color.c	source/blender/editors/interface/eyedroppers/eyedropper_color.c
R099	source/blender/editors/interface/interface_eyedropper_colorband.c	source/blender/editors/interface/eyedroppers/eyedropper_colorband.c
R099	source/blender/editors/interface/interface_eyedropper_datablock.c	source/blender/editors/interface/eyedroppers/eyedropper_datablock.c
R099	source/blender/editors/interface/interface_eyedropper_depth.c	source/blender/editors/interface/eyedroppers/eyedropper_depth.c
R099	source/blender/editors/interface/interface_eyedropper_driver.c	source/blender/editors/interface/eyedroppers/eyedropper_driver.c
R099	source/blender/editors/interface/interface_eyedropper_gpencil_color.c	source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.c
R092	source/blender/editors/interface/interface_eyedropper_intern.h	source/blender/editors/interface/eyedroppers/eyedropper_intern.h
R098	source/blender/editors/interface/interface_eyedropper.c	source/blender/editors/interface/eyedroppers/interface_eyedropper.c

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

diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 4c206f9c057..07c3bfdafbf 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -26,6 +26,13 @@ set(INC
 )
 
 set(SRC
+  eyedroppers/interface_eyedropper.c
+  eyedroppers/eyedropper_color.c
+  eyedroppers/eyedropper_colorband.c
+  eyedroppers/eyedropper_datablock.c
+  eyedroppers/eyedropper_depth.c
+  eyedroppers/eyedropper_driver.c
+  eyedroppers/eyedropper_gpencil_color.c
   interface.cc
   interface_align.c
   interface_anim.c
@@ -35,13 +42,6 @@ set(SRC
   interface_drag.cc
   interface_draw.c
   interface_dropboxes.cc
-  interface_eyedropper.c
-  interface_eyedropper_color.c
-  interface_eyedropper_colorband.c
-  interface_eyedropper_datablock.c
-  interface_eyedropper_depth.c
-  interface_eyedropper_driver.c
-  interface_eyedropper_gpencil_color.c
   interface_handlers.c
   interface_icons.c
   interface_icons_event.c
@@ -80,7 +80,7 @@ set(SRC
   views/interface_view.cc
   views/tree_view.cc
 
-  interface_eyedropper_intern.h
+  eyedroppers/eyedropper_intern.h
   interface_intern.h
   interface_regions_intern.h
 )
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/eyedroppers/eyedropper_color.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_color.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_color.c
index c015a60de89..a2161008ec4 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.c
@@ -50,7 +50,7 @@
 
 #include "RE_pipeline.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 
 typedef struct Eyedropper {
   struct ColorManagedDisplay *display;
diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_colorband.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_colorband.c
index a69c36fefbd..3f63a8020ed 100644
--- a/source/blender/editors/interface/interface_eyedropper_colorband.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.c
@@ -35,7 +35,7 @@
 
 #include "interface_intern.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 
 typedef struct Colorband_RNAUpdateCb {
   PointerRNA ptr;
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_datablock.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_datablock.c
index 01b958576b6..1710d0faa4d 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.c
@@ -38,7 +38,7 @@
 #include "ED_space_api.h"
 #include "ED_view3d.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 #include "interface_intern.h"
 
 /**
diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/eyedroppers/eyedropper_depth.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_depth.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_depth.c
index 3c6f127582a..3fb5a74944b 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.c
@@ -38,7 +38,7 @@
 #include "ED_space_api.h"
 #include "ED_view3d.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 #include "interface_intern.h"
 
 /**
diff --git a/source/blender/editors/interface/interface_eyedropper_driver.c b/source/blender/editors/interface/eyedroppers/eyedropper_driver.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_driver.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_driver.c
index 0cacb55c60c..14c00c21a5c 100644
--- a/source/blender/editors/interface/interface_eyedropper_driver.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_driver.c
@@ -32,7 +32,7 @@
 
 #include "ED_keyframing.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 #include "interface_intern.h"
 
 typedef struct DriverDropper {
diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.c
similarity index 99%
rename from source/blender/editors/interface/interface_eyedropper_gpencil_color.c
rename to source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.c
index f3c70e6a96a..c3879fe8bbd 100644
--- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.c
@@ -46,7 +46,7 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
 
-#include "interface_eyedropper_intern.h"
+#include "eyedropper_intern.h"
 #include "interface_intern.h"
 
 typedef struct EyedropperGPencil {
diff --git a/source/blender/editors/interface/interface_eyedropper_intern.h b/source/blender/editors/interface/eyedroppers/eyedropper_intern.h
similarity index 92%
rename from source/blender/editors/interface/interface_eyedropper_intern.h
rename to source/blender/editors/interface/eyedroppers/eyedropper_intern.h
index 76316a85807..946f2145d1d 100644
--- a/source/blender/editors/interface/interface_eyedropper_intern.h
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_intern.h
@@ -3,7 +3,7 @@
 /** \file
  * \ingroup edinterface
  *
- * Share between interface_eyedropper_*.c files.
+ * Share between `interface/eyedropper/` files.
  */
 
 #pragma once
@@ -35,7 +35,7 @@ void datadropper_win_area_find(const struct bContext *C,
  *
  * Special check for image or nodes where we MAY have HDR pixels which don't display.
  *
- * \note Exposed by 'interface_eyedropper_intern.h' for use with color band picking.
+ * \note Exposed by 'eyedropper_intern.h' for use with color band picking.
  */
 void eyedropper_color_sample_fl(bContext *C, const int m_xy[2], float r_col[3]);
 
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/eyedroppers/interface_eyedropper.c
similarity index 98%
rename from source/blender/editors/interface/interface_eyedropper.c
rename to source/blender/editors/interface/eyedroppers/interface_eyedropper.c
index eaec1e249b7..c6fb8f0ab68 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/eyedroppers/interface_eyedropper.c
@@ -21,7 +21,7 @@
 
 #include "interface_intern.h"
 
-#include "interface_eyedropper_intern.h" /* own include */
+#include "eyedropper_intern.h" /* own include */
 
 /* -------------------------------------------------------------------- */
 /* Keymap