Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/editors/animation/CMakeLists.txt2
-rw-r--r--source/blender/editors/animation/time_scrub_ui.c (renamed from source/blender/editors/animation/anim_scrubbing.c)2
-rw-r--r--source/blender/editors/include/ED_time_scrub_ui.h (renamed from source/blender/editors/include/ED_scrubbing.h)0
-rw-r--r--source/blender/editors/screen/area.c2
-rw-r--r--source/blender/editors/space_action/space_action.c2
-rw-r--r--source/blender/editors/space_clip/space_clip.c2
-rw-r--r--source/blender/editors/space_graph/space_graph.c2
-rw-r--r--source/blender/editors/space_nla/space_nla.c2
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
-rw-r--r--source/blender/editors/util/CMakeLists.txt1
10 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 098c871823e..ce6778a1ff9 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -44,7 +44,6 @@ set(SRC
anim_markers.c
anim_motion_paths.c
anim_ops.c
- anim_scrubbing.c
drivers.c
fmodifier_ui.c
keyframes_draw.c
@@ -52,6 +51,7 @@ set(SRC
keyframes_general.c
keyframing.c
keyingsets.c
+ time_scrub_ui.c
anim_intern.h
)
diff --git a/source/blender/editors/animation/anim_scrubbing.c b/source/blender/editors/animation/time_scrub_ui.c
index b0c9acff2ab..37e7eab74d4 100644
--- a/source/blender/editors/animation/anim_scrubbing.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -27,7 +27,7 @@
#include "GPU_matrix.h"
#include "GPU_state.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "WM_api.h"
#include "WM_types.h"
diff --git a/source/blender/editors/include/ED_scrubbing.h b/source/blender/editors/include/ED_time_scrub_ui.h
index 26d9f3d923f..26d9f3d923f 100644
--- a/source/blender/editors/include/ED_scrubbing.h
+++ b/source/blender/editors/include/ED_time_scrub_ui.h
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index d74d4a0d798..708dff36a72 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -50,7 +50,7 @@
#include "ED_screen.h"
#include "ED_screen_types.h"
#include "ED_space_api.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "GPU_immediate.h"
#include "GPU_immediate_util.h"
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index d4aef9eb7b8..ad4346d882c 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -53,7 +53,7 @@
#include "ED_screen.h"
#include "ED_anim_api.h"
#include "ED_markers.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "action_intern.h" /* own include */
#include "GPU_framebuffer.h"
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index dd58e7e28cc..13d190e6861 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -47,7 +47,7 @@
#include "ED_mask.h"
#include "ED_space_api.h"
#include "ED_screen.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "ED_select_utils.h"
#include "ED_clip.h"
#include "ED_transform.h"
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 0e16b917f35..4c675b6e8d1 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -42,7 +42,7 @@
#include "ED_screen.h"
#include "ED_anim_api.h"
#include "ED_markers.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "GPU_immediate.h"
#include "GPU_state.h"
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
index 4381d0dfb15..7243edfb850 100644
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -40,7 +40,7 @@
#include "ED_anim_api.h"
#include "ED_markers.h"
#include "ED_screen.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "WM_api.h"
#include "WM_types.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 60bc320c026..805ec26950a 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -60,7 +60,7 @@
#include "ED_mask.h"
#include "ED_sequencer.h"
#include "ED_screen.h"
-#include "ED_scrubbing.h"
+#include "ED_time_scrub_ui.h"
#include "ED_space_api.h"
#include "BIF_glutil.h"
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 3b49784d5eb..0564cb07897 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -84,6 +84,7 @@ set(SRC
../include/ED_sound.h
../include/ED_space_api.h
../include/ED_text.h
+ ../include/ED_time_scrub_ui.h
../include/ED_transform.h
../include/ED_transform_snap_object_context.h
../include/ED_transverts.h