Dopesheet-Timeline: Removal of Timeline Editor!

This commit removes all references to the old timeline editor.

Unfortuantely, the removal of the Timeline spacetype defining
functions has ended up breaking the version patching code I'd
been working on earlier (as now, the editor gets marked as
"unknown/info" before we get a chance to patch it!)

4 files changed, 0 insertions, 1085 deletions

diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt
deleted file mode 100644
index 90af405eaa8..00000000000
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
-	../include
-	../../blenkernel
-	../../blenlib
-	../../gpu
-	../../makesdna
-	../../makesrna
-	../../windowmanager
-	../../../../intern/guardedalloc
-	../../../../intern/glew-mx
-)
-
-set(INC_SYS
-	${GLEW_INCLUDE_PATH}
-)
-
-set(SRC
-	space_time.c
-	time_ops.c
-
-	time_intern.h
-)
-
-add_definitions(${GL_DEFINITIONS})
-
-blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
deleted file mode 100644
index 24650fead95..00000000000
--- a/source/blender/editors/space_time/space_time.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_time/space_time.c
- *  \ingroup sptime
- */
-
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_cachefile_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_dlrbTree.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_constraint.h"
-#include "BKE_context.h"
-#include "BKE_main.h"
-#include "BKE_modifier.h"
-#include "BKE_screen.h"
-#include "BKE_pointcache.h"
-
-#include "ED_anim_api.h"
-#include "ED_keyframes_draw.h"
-#include "ED_screen.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-#include "WM_message.h"
-
-#include "RNA_access.h"
-
-#include "BIF_gl.h"
-
-#include "UI_resources.h"
-#include "UI_view2d.h"
-#include "UI_interface.h"
-
-#include "ED_space_api.h"
-#include "ED_markers.h"
-
-#include "GPU_immediate.h"
-#include "GPU_matrix.h"
-
-#include "time_intern.h"
-
-/* ************************ main time area region *********************** */
-
-static void time_draw_sfra_efra(Scene *scene, View2D *v2d)
-{	
-	/* draw darkened area outside of active timeline 
-	 * frame range used is preview range or scene range 
-	 */
-	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
-
-	Gwn_VertFormat *format = immVertexFormat();
-	unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
-
-	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-	immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
-
-	if (PSFRA < PEFRA) {
-		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-		immRectf(pos, (float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
-	}
-	else {
-		immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
-	}
-
-	glDisable(GL_BLEND);
-
-	/* thin lines where the actual frames are */
-	immUniformThemeColorShade(TH_BACK, -60);
-
-	immBegin(GWN_PRIM_LINES, 4);
-
-	immVertex2f(pos, (float)PSFRA, v2d->cur.ymin);
-	immVertex2f(pos, (float)PSFRA, v2d->cur.ymax);
-
-	immVertex2f(pos, (float)PEFRA, v2d->cur.ymin);
-	immVertex2f(pos, (float)PEFRA, v2d->cur.ymax);
-
-	immEnd();
-	immUnbindProgram();
-}
-
-static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
-{
-	PTCacheID *pid;
-	ListBase pidlist;
-	const float cache_draw_height = (4.0f * UI_DPI_FAC * U.pixelsize);
-	float yoffs = 0.f;
-	
-	if (!(stime->cache_display & TIME_CACHE_DISPLAY) || (!ob))
-		return;
-
-	BKE_ptcache_ids_from_object(&pidlist, ob, scene, 0);
-
-	unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
-	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-
-	/* iterate over pointcaches on the active object, drawing */
-	for (pid = pidlist.first; pid; pid = pid->next) {
-		float col[4];
-
-		switch (pid->type) {
-			case PTCACHE_TYPE_SOFTBODY:
-				if (!(stime->cache_display & TIME_CACHE_SOFTBODY)) continue;
-				break;
-			case PTCACHE_TYPE_PARTICLES:
-				if (!(stime->cache_display & TIME_CACHE_PARTICLES)) continue;
-				break;
-			case PTCACHE_TYPE_CLOTH:
-				if (!(stime->cache_display & TIME_CACHE_CLOTH)) continue;
-				break;
-			case PTCACHE_TYPE_SMOKE_DOMAIN:
-			case PTCACHE_TYPE_SMOKE_HIGHRES:
-				if (!(stime->cache_display & TIME_CACHE_SMOKE)) continue;
-				break;
-			case PTCACHE_TYPE_DYNAMICPAINT:
-				if (!(stime->cache_display & TIME_CACHE_DYNAMICPAINT)) continue;
-				break;
-			case PTCACHE_TYPE_RIGIDBODY:
-				if (!(stime->cache_display & TIME_CACHE_RIGIDBODY)) continue;
-				break;
-		}
-
-		if (pid->cache->cached_frames == NULL)
-			continue;
-
-		gpuPushMatrix();
-		gpuTranslate2f(0.0, (float)V2D_SCROLL_HEIGHT + yoffs);
-		gpuScale2f(1.0, cache_draw_height);
-		
-		switch (pid->type) {
-			case PTCACHE_TYPE_SOFTBODY:
-				col[0] = 1.0;   col[1] = 0.4;   col[2] = 0.02;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_PARTICLES:
-				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.02;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_CLOTH:
-				col[0] = 0.1;   col[1] = 0.1;   col[2] = 0.75;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_SMOKE_DOMAIN:
-			case PTCACHE_TYPE_SMOKE_HIGHRES:
-				col[0] = 0.2;   col[1] = 0.2;   col[2] = 0.2;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_DYNAMICPAINT:
-				col[0] = 1.0;   col[1] = 0.1;   col[2] = 0.75;
-				col[3] = 0.1;
-				break;
-			case PTCACHE_TYPE_RIGIDBODY:
-				col[0] = 1.0;   col[1] = 0.6;   col[2] = 0.0;
-				col[3] = 0.1;
-				break;
-			default:
-				col[0] = 1.0;   col[1] = 0.0;   col[2] = 1.0;
-				col[3] = 0.1;
-				BLI_assert(0);
-				break;
-		}
-
-		const int sta = pid->cache->startframe, end = pid->cache->endframe;
-		const int len = (end - sta + 1) * 6;
-
-		glEnable(GL_BLEND);
-
-		immUniformColor4fv(col);
-		immRectf(pos, (float)sta, 0.0, (float)end, 1.0);
-
-		col[3] = 0.4f;
-		if (pid->cache->flag & PTCACHE_BAKED) {
-			col[0] -= 0.4f; col[1] -= 0.4f; col[2] -= 0.4f;
-		}
-		else if (pid->cache->flag & PTCACHE_OUTDATED) {
-			col[0] += 0.4f; col[1] += 0.4f; col[2] += 0.4f;
-		}
-
-		immUniformColor4fv(col);
-
-		if (len > 0) {
-			immBeginAtMost(GWN_PRIM_TRIS, len);
-
-			/* draw a quad for each cached frame */
-			for (int i = sta; i <= end; i++) {
-				if (pid->cache->cached_frames[i - sta]) {
-					immVertex2f(pos, (float)i - 0.5f, 0.0f);
-					immVertex2f(pos, (float)i - 0.5f, 1.0f);
-					immVertex2f(pos, (float)i + 0.5f, 1.0f);
-
-					immVertex2f(pos, (float)i - 0.5f, 0.0f);
-					immVertex2f(pos, (float)i + 0.5f, 1.0f);
-					immVertex2f(pos, (float)i + 0.5f, 0.0f);
-				}
-			}
-
-			immEnd();
-		}
-
-		glDisable(GL_BLEND);
-
-		gpuPopMatrix();
-
-		yoffs += cache_draw_height;
-	}
-
-	immUnbindProgram();
-
-	BLI_freelistN(&pidlist);
-}
-
-/* helper function - find actkeycolumn that occurs on cframe, or the nearest one if not found */
-static ActKeyColumn *time_cfra_find_ak(ActKeyColumn *ak, float cframe)
-{
-	ActKeyColumn *akn = NULL;
-	
-	/* sanity checks */
-	if (ak == NULL)
-		return NULL;
-	
-	/* check if this is a match, or whether it is in some subtree */
-	if (cframe < ak->cfra)
-		akn = time_cfra_find_ak(ak->left, cframe);
-	else if (cframe > ak->cfra)
-		akn = time_cfra_find_ak(ak->right, cframe);
-		
-	/* if no match found (or found match), just use the current one */
-	if (akn == NULL)
-		return ak;
-	else
-		return akn;
-}
-
-/* helper for time_draw_keyframes() */
-static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, const unsigned char color[3])
-{
-	bDopeSheet ads = {NULL};
-	DLRBT_Tree keys;
-	ActKeyColumn *ak;
-	
-	float fac1 = (GS(id->name) == ID_GD) ? 0.8f : 0.6f; /* draw GPencil keys taller, to help distinguish them */
-	float fac2 = 1.0f - fac1;
-	
-	float ymin = v2d->tot.ymin;
-	float ymax = v2d->tot.ymax * fac1 + ymin * fac2;
-	
-	/* init binarytree-list for getting keyframes */
-	BLI_dlrbTree_init(&keys);
-	
-	/* init dopesheet settings */
-	if (onlysel)
-		ads.filterflag |= ADS_FILTER_ONLYSEL;
-
-	/* populate tree with keyframe nodes */
-	switch (GS(id->name)) {
-		case ID_SCE:
-			scene_to_keylist(&ads, (Scene *)id, &keys, NULL);
-			break;
-		case ID_OB:
-			ob_to_keylist(&ads, (Object *)id, &keys, NULL);
-			break;
-		case ID_GD:
-			gpencil_to_keylist(&ads, (bGPdata *)id, &keys);
-			break;
-		case ID_CF:
-			cachefile_to_keylist(&ads, (CacheFile *)id, &keys, NULL);
-			break;
-		default:
-			break;
-	}
-		
-	/* build linked-list for searching */
-	BLI_dlrbTree_linkedlist_sync(&keys);
-	
-	/* start drawing keyframes 
-	 *	- we use the binary-search capabilities of the tree to only start from 
-	 *	  the first visible keyframe (last one can then be easily checked)
-	 *	- draw within a single GL block to be faster
-	 */
-
-	ActKeyColumn *link;
-	int max_len = 0;
-
-	ak = time_cfra_find_ak(keys.root, v2d->cur.xmin);
-
-	for (link = ak; link; link = link->next) {
-		max_len++;
-	}
-
-	if (max_len > 0) {
-
-		Gwn_VertFormat *format = immVertexFormat();
-		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
-
-		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-		immUniformColor3ubv(color);
-
-		immBeginAtMost(GWN_PRIM_LINES, max_len * 2);
-
-		for (; (ak) && (ak->cfra <= v2d->cur.xmax); ak = ak->next) {
-			immVertex2f(pos, ak->cfra, ymin);
-			immVertex2f(pos, ak->cfra, ymax);
-		}
-
-		immEnd();
-		immUnbindProgram();
-	}
-
-	/* free temp stuff */
-	BLI_dlrbTree_free(&keys);
-}
-
-static void time_draw_caches_keyframes(Main *bmain, ViewLayer *view_layer, View2D *v2d, bool onlysel, const unsigned char color[3])
-{
-	CacheFile *cache_file;
-
-	for (cache_file = bmain->cachefiles.first;
-	     cache_file;
-	     cache_file = cache_file->id.next)
-	{
-		cache_file->draw_flag &= ~CACHEFILE_KEYFRAME_DRAWN;
-	}
-
-	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
-		Object *ob = base->object;
-
-		ModifierData *md = modifiers_findByType(ob, eModifierType_MeshSequenceCache);
-
-		if (md) {
-			MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
-
-			cache_file = mcmd->cache_file;
-
-			if (!cache_file || (cache_file->draw_flag & CACHEFILE_KEYFRAME_DRAWN) != 0) {
-				continue;
-			}
-
-			cache_file->draw_flag |= CACHEFILE_KEYFRAME_DRAWN;
-
-			time_draw_idblock_keyframes(v2d, (ID *)cache_file, onlysel, color);
-		}
-
-		for (bConstraint *con = ob->constraints.first; con; con = con->next) {
-			if (con->type != CONSTRAINT_TYPE_TRANSFORM_CACHE) {
-				continue;
-			}
-
-			bTransformCacheConstraint *data = con->data;
-
-			cache_file = data->cache_file;
-
-			if (!cache_file || (cache_file->draw_flag & CACHEFILE_KEYFRAME_DRAWN) != 0) {
-				continue;
-			}
-
-			cache_file->draw_flag |= CACHEFILE_KEYFRAME_DRAWN;
-
-			time_draw_idblock_keyframes(v2d, (ID *)cache_file, onlysel, color);
-		}
-	}
-}
-
-/* draw keyframe lines for timeline */
-static void time_draw_keyframes(const bContext *C, ARegion *ar)
-{
-	Scene *scene = CTX_data_scene(C);
-	ViewLayer *view_layer = CTX_data_view_layer(C);
-	Object *ob = CTX_data_active_object(C);
-	View2D *v2d = &ar->v2d;
-	bool onlysel = ((scene->flag & SCE_KEYS_NO_SELONLY) == 0);
-	unsigned char color[3];
-	
-	/* set this for all keyframe lines once and for all */
-	glLineWidth(1.0);
-
-	/* draw cache files keyframes (if available) */
-	UI_GetThemeColor3ubv(TH_TIME_KEYFRAME, color);
-	time_draw_caches_keyframes(CTX_data_main(C), view_layer, v2d, onlysel, color);
-
-	/* draw grease pencil keyframes (if available) */	
-	UI_GetThemeColor3ubv(TH_TIME_GP_KEYFRAME, color);
-
-	if (scene->gpd) {
-		time_draw_idblock_keyframes(v2d, (ID *)scene->gpd, onlysel, color);
-	}
-	if (ob && ob->gpd) {
-		time_draw_idblock_keyframes(v2d, (ID *)ob->gpd, onlysel, color);
-	}
-	
-	/* draw scene keyframes first 
-	 *	- don't try to do this when only drawing active/selected data keyframes,
-	 *	  since this can become quite slow
-	 */
-	if (onlysel == 0) {
-		/* set draw color */
-		UI_GetThemeColorShade3ubv(TH_TIME_KEYFRAME, -50, color);
-		time_draw_idblock_keyframes(v2d, (ID *)scene, onlysel, color);
-	}
-	
-	/* draw keyframes from selected objects 
-	 *  - only do the active object if in posemode (i.e. showing only keyframes for the bones)
-	 *    OR the onlysel flag was set, which means that only active object's keyframes should
-	 *    be considered
-	 */
-	UI_GetThemeColor3ubv(TH_TIME_KEYFRAME, color);
-
-	if (ob && ((ob->mode == OB_MODE_POSE) || onlysel)) {
-		/* draw keyframes for active object only */
-		time_draw_idblock_keyframes(v2d, (ID *)ob, onlysel, color);
-	}
-	else {
-		bool active_done = false;
-		
-		/* draw keyframes from all selected objects */
-		CTX_DATA_BEGIN (C, Object *, obsel, selected_objects)
-		{
-			/* last arg is 0, since onlysel doesn't apply here... */
-			time_draw_idblock_keyframes(v2d, (ID *)obsel, 0, color);
-			
-			/* if this object is the active one, set flag so that we don't draw again */
-			if (obsel == ob)
-				active_done = true;
-		}
-		CTX_DATA_END;
-		
-		/* if active object hasn't been done yet, draw it... */
-		if (ob && (active_done == 0))
-			time_draw_idblock_keyframes(v2d, (ID *)ob, 0, color);
-	}
-}
-
-/* ---------------- */
-
-/* editor level listener */
-static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
-                          WorkSpace *UNUSED(workspace))
-{
-
-	/* mainly for updating cache display */
-	switch (wmn->category) {
-		case NC_OBJECT:
-		{
-			switch (wmn->data) {
-				case ND_BONE_SELECT:
-				case ND_BONE_ACTIVE:
-				case ND_POINTCACHE:
-				case ND_MODIFIER:
-				case ND_PARTICLE:
-				case ND_KEYS:
-					ED_area_tag_refresh(sa);
-					ED_area_tag_redraw(sa);
-					break;
-			}
-			break;
-		}
-		case NC_SCENE:
-		{
-			switch (wmn->data) {
-				case ND_RENDER_RESULT:
-					ED_area_tag_redraw(sa);
-					break;
-				case ND_OB_ACTIVE:
-				case ND_FRAME:
-					ED_area_tag_refresh(sa);
-					break;
-				case ND_FRAME_RANGE:
-				{
-					ARegion *ar;
-					Scene *scene = wmn->reference;
-
-					for (ar = sa->regionbase.first; ar; ar = ar->next) {
-						if (ar->regiontype == RGN_TYPE_WINDOW) {
-							ar->v2d.tot.xmin = (float)(SFRA - 4);
-							ar->v2d.tot.xmax = (float)(EFRA + 4);
-							break;
-						}
-					}
-					break;
-				}
-			}
-			break;
-		}
-		case NC_SPACE:
-		{
-			switch (wmn->data) {
-				case ND_SPACE_CHANGED:
-					ED_area_tag_refresh(sa);
-					break;
-			}
-			break;
-		}
-		case NC_WM:
-		{
-			switch (wmn->data) {
-				case ND_FILEREAD:
-					ED_area_tag_refresh(sa);
-					break;
-			}
-			break;
-		}
-	}
-}
-
-/* ---------------- */
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void time_main_region_init(wmWindowManager *wm, ARegion *ar)
-{
-	wmKeyMap *keymap;
-	
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
-	
-	/* own keymap */
-	keymap = WM_keymap_find(wm->defaultconf, "Timeline", SPACE_TIME, 0);
-	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
-}
-
-static void time_main_region_draw(const bContext *C, ARegion *ar)
-{
-	/* draw entirely, view changes should be handled here */
-	Scene *scene = CTX_data_scene(C);
-	SpaceTime *stime = CTX_wm_space_time(C);
-	Object *obact = CTX_data_active_object(C);
-	View2D *v2d = &ar->v2d;
-	View2DGrid *grid;
-	View2DScrollers *scrollers;
-	int unit, flag = 0;
-	
-	/* clear and setup matrix */
-	UI_ThemeClearColor(TH_BACK);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	UI_view2d_view_ortho(v2d);
-	
-	/* grid */
-	unit = (stime->flag & TIME_DRAWFRAMES) ? V2D_UNIT_FRAMES : V2D_UNIT_SECONDS;
-	grid = UI_view2d_grid_calc(scene, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY, ar->winx, ar->winy);
-	UI_view2d_grid_draw(v2d, grid, (V2D_VERTICAL_LINES | V2D_VERTICAL_AXIS));
-	UI_view2d_grid_free(grid);
-	
-	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
-
-	/* start and end frame */
-	time_draw_sfra_efra(scene, v2d);
-	
-	/* current frame */
-	flag = DRAWCFRA_WIDE; /* this is only really needed on frames where there's a keyframe, but this will do... */
-	if ((stime->flag & TIME_DRAWFRAMES) == 0)  flag |= DRAWCFRA_UNIT_SECONDS;
-	if (stime->flag & TIME_CFRA_NUM)           flag |= DRAWCFRA_SHOW_NUMBOX;
-	ANIM_draw_cfra(C, v2d, flag);
-	
-	UI_view2d_view_ortho(v2d);
-	
-	/* keyframes */
-	time_draw_keyframes(C, ar);
-	
-	/* markers */
-	UI_view2d_view_orthoSpecial(ar, v2d, 1);
-	ED_markers_draw(C, 0);
-	
-	/* caches */
-	time_draw_cache(stime, obact, scene);
-	
-	/* callback */
-	UI_view2d_view_ortho(v2d);
-	ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
-
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
-	
-	/* scrollers */
-	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
-	UI_view2d_scrollers_draw(C, v2d, scrollers);
-	UI_view2d_scrollers_free(scrollers);
-}
-
-static void time_main_region_listener(
-        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
-        wmNotifier *wmn, const Scene *UNUSED(scene))
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SPACE:
-			if (wmn->data == ND_SPACE_TIME)
-				ED_region_tag_redraw(ar);
-			break;
-
-		case NC_ANIMATION:
-			ED_region_tag_redraw(ar);
-			break;
-		
-		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_OB_SELECT:
-				case ND_OB_ACTIVE:
-				case ND_FRAME:
-				case ND_FRAME_RANGE:
-				case ND_KEYINGSET:
-				case ND_RENDER_OPTIONS:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_GPENCIL:
-			if (wmn->data == ND_DATA)
-				ED_region_tag_redraw(ar);
-			break;
-		case NC_SCREEN:
-			if (ELEM(wmn->data, ND_LAYER)) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-	}
-}
-
-static void time_main_region_message_subscribe(
-        const struct bContext *UNUSED(C),
-        struct WorkSpace *UNUSED(workspace), struct Scene *scene,
-        struct bScreen *screen, struct ScrArea *sa, struct ARegion *ar,
-        struct wmMsgBus *mbus)
-{
-	PointerRNA ptr;
-	RNA_pointer_create(&screen->id, &RNA_SpaceTimeline, sa->spacedata.first, &ptr);
-
-	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
-		.owner = ar,
-		.user_data = ar,
-		.notify = ED_region_do_msg_notify_tag_redraw,
-	};
-
-	/* Timeline depends on scene properties. */
-	{
-		bool use_preview = (scene->r.flag & SCER_PRV_RANGE);
-		extern PropertyRNA rna_Scene_frame_start;
-		extern PropertyRNA rna_Scene_frame_end;
-		extern PropertyRNA rna_Scene_frame_preview_start;
-		extern PropertyRNA rna_Scene_frame_preview_end;
-		extern PropertyRNA rna_Scene_use_preview_range;
-		extern PropertyRNA rna_Scene_frame_current;
-		const PropertyRNA *props[] = {
-			use_preview ? &rna_Scene_frame_preview_start : &rna_Scene_frame_start,
-			use_preview ? &rna_Scene_frame_preview_end   : &rna_Scene_frame_end,
-			&rna_Scene_use_preview_range,
-			&rna_Scene_frame_current,
-		};
-
-		PointerRNA idptr;
-		RNA_id_pointer_create(&scene->id, &idptr);
-
-		for (int i = 0; i < ARRAY_SIZE(props); i++) {
-			WM_msg_subscribe_rna(mbus, &idptr, props[i], &msg_sub_value_region_tag_redraw, __func__);
-		}
-	}
-}
-
-
-/* ************************ header time area region *********************** */
-
-/* add handlers, stuff you only do once or on area/region changes */
-static void time_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
-{
-	ED_region_header_init(ar);
-}
-
-static void time_header_region_draw(const bContext *C, ARegion *ar)
-{
-	ED_region_header(C, ar);
-}
-
-static void time_header_region_listener(
-        bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
-        wmNotifier *wmn, const Scene *UNUSED(scene))
-{
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SCREEN:
-		{
-			if (wmn->data == ND_ANIMPLAY)
-				ED_region_tag_redraw(ar);
-			break;
-		}
-		case NC_SCENE:
-		{
-			switch (wmn->data) {
-				case ND_RENDER_RESULT:
-				case ND_OB_SELECT:
-				case ND_FRAME:
-				case ND_FRAME_RANGE:
-				case ND_KEYINGSET:
-				case ND_RENDER_OPTIONS:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		}
-		case NC_SPACE:
-		{
-			if (wmn->data == ND_SPACE_TIME)
-				ED_region_tag_redraw(ar);
-			break;
-		}
-	}
-}
-
-/* ******************** default callbacks for time space ***************** */
-
-static SpaceLink *time_new(const bContext *C)
-{
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar;
-	SpaceTime *stime;
-
-	stime = MEM_callocN(sizeof(SpaceTime), "inittime");
-
-	stime->spacetype = SPACE_TIME;
-	stime->flag |= TIME_DRAWFRAMES;
-	
-	/* enable all cache display */
-	stime->cache_display |= TIME_CACHE_DISPLAY;
-	stime->cache_display |= (TIME_CACHE_SOFTBODY | TIME_CACHE_PARTICLES);
-	stime->cache_display |= (TIME_CACHE_CLOTH | TIME_CACHE_SMOKE | TIME_CACHE_DYNAMICPAINT);
-	stime->cache_display |= TIME_CACHE_RIGIDBODY;
-
-	/* header */
-	ar = MEM_callocN(sizeof(ARegion), "header for time");
-	
-	BLI_addtail(&stime->regionbase, ar);
-	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = RGN_ALIGN_BOTTOM;
-	
-	/* main region */
-	ar = MEM_callocN(sizeof(ARegion), "main region for time");
-	
-	BLI_addtail(&stime->regionbase, ar);
-	ar->regiontype = RGN_TYPE_WINDOW;
-	
-	ar->v2d.tot.xmin = (float)(SFRA - 4);
-	ar->v2d.tot.ymin = 0.0f;
-	ar->v2d.tot.xmax = (float)(EFRA + 4);
-	ar->v2d.tot.ymax = 50.0f;
-	
-	ar->v2d.cur = ar->v2d.tot;
-
-	ar->v2d.min[0] = 1.0f;
-	ar->v2d.min[1] = 50.0f;
-
-	ar->v2d.max[0] = MAXFRAMEF;
-	ar->v2d.max[1] = 50.0;
-
-	ar->v2d.minzoom = 0.1f;
-	ar->v2d.maxzoom = 10.0;
-
-	ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_SCALE_HORIZONTAL);
-	ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;
-	ar->v2d.keepofs |= V2D_LOCKOFS_Y;
-	ar->v2d.keepzoom |= V2D_LOCKZOOM_Y;
-
-
-	return (SpaceLink *)stime;
-}
-
-/* spacetype; init callback in ED_area_initialize() */
-/* init is called to (re)initialize an existing editor (file read, screen changes) */
-/* validate spacedata, add own area level handlers */
-static void time_init(wmWindowManager *UNUSED(wm), ScrArea *sa)
-{
-	//SpaceTime *stime = (SpaceTime *)sa->spacedata.first;
-}
-
-static SpaceLink *time_duplicate(SpaceLink *sl)
-{
-	SpaceTime *stime = (SpaceTime *)sl;
-	SpaceTime *stimen = MEM_dupallocN(stime);
-	
-	return (SpaceLink *)stimen;
-}
-
-/* only called once, from space_api/spacetypes.c */
-/* it defines all callbacks to maintain spaces */
-void ED_spacetype_time(void)
-{
-	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype time");
-	ARegionType *art;
-	
-	st->spaceid = SPACE_TIME;
-	strncpy(st->name, "Timeline", BKE_ST_MAXNAME);
-	
-	st->new = time_new;
-	st->init = time_init;
-	st->duplicate = time_duplicate;
-	st->operatortypes = time_operatortypes;
-	st->keymap = NULL;
-	st->listener = time_listener;
-	
-	/* regions: main window */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype time region");
-	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
-	
-	art->init = time_main_region_init;
-	art->draw = time_main_region_draw;
-	art->listener = time_main_region_listener;
-	art->message_subscribe = time_main_region_message_subscribe;
-	art->keymap = time_keymap;
-	art->lock = 1;   /* Due to pointcache, see T4960. */
-	BLI_addhead(&st->regiontypes, art);
-	
-	/* regions: header */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype time region");
-	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey = HEADERY;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
-	
-	art->init = time_header_region_init;
-	art->draw = time_header_region_draw;
-	art->listener = time_header_region_listener;
-	BLI_addhead(&st->regiontypes, art);
-		
-	BKE_spacetype_register(st);
-}
diff --git a/source/blender/editors/space_time/time_intern.h b/source/blender/editors/space_time/time_intern.h
deleted file mode 100644
index ced36b2ac2d..00000000000
--- a/source/blender/editors/space_time/time_intern.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_time/time_intern.h
- *  \ingroup sptime
- */
-
-
-#ifndef __TIME_INTERN_H__
-#define __TIME_INTERN_H__
-
-/* internal exports only */
-
-
-/* time_ops.c */
-void time_operatortypes(void);
-void time_keymap(struct wmKeyConfig *keyconf);
-
-#endif /* __TIME_INTERN_H__ */
-
diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c
deleted file mode 100644
index f05b3e94b4e..00000000000
--- a/source/blender/editors/space_time/time_ops.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_time/time_ops.c
- *  \ingroup sptime
- */
-
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "DNA_scene_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_context.h"
-
-#include "ED_anim_api.h"
-#include "ED_screen.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "time_intern.h"
-
-
-/* ************************ View All Operator *******************************/
-
-static int time_view_all_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Scene *scene = CTX_data_scene(C);
-	ARegion *ar = CTX_wm_region(C);
-
-	if (ELEM(NULL, scene, ar))
-		return OPERATOR_CANCELLED;
-
-	View2D *v2d = &ar->v2d;
-
-	/* set extents of view to start/end frames (Preview Range too) */
-	v2d->cur.xmin = (float)PSFRA;
-	v2d->cur.xmax = (float)PEFRA;
-	
-	/* we need an extra "buffer" factor on either side so that the endpoints are visible */
-	const float extra = 0.01f * BLI_rctf_size_x(&v2d->cur);
-	v2d->cur.xmin -= extra;
-	v2d->cur.xmax += extra;
-	
-	/* this only affects this TimeLine instance, so just force redraw of this region */
-	ED_region_tag_redraw(ar);
-	
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_view_all(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "View All";
-	ot->idname = "TIME_OT_view_all";
-	ot->description = "Show the entire playable frame range";
-	
-	/* api callbacks */
-	ot->exec = time_view_all_exec;
-	ot->poll = ED_operator_timeline_active;
-	
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* ************************ View Frame Operator *******************************/
-
-static int time_view_frame_exec(bContext *C, wmOperator *op)
-{
-	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
-	ANIM_center_frame(C, smooth_viewtx);
-	
-	return OPERATOR_FINISHED;
-}
-
-static void TIME_OT_view_frame(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "View Frame";
-	ot->idname = "TIME_OT_view_frame";
-	ot->description = "Reset viewable area to show range around current frame";
-	
-	/* api callbacks */
-	ot->exec = time_view_frame_exec;
-	ot->poll = ED_operator_timeline_active;
-	
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
-/* ************************** registration **********************************/
-
-void time_operatortypes(void)
-{
-	WM_operatortype_append(TIME_OT_view_all);
-	WM_operatortype_append(TIME_OT_view_frame);
-}
-
-void time_keymap(wmKeyConfig *keyconf)
-{
-	wmKeyMap *keymap = WM_keymap_find(keyconf, "Timeline", SPACE_TIME, 0);
-	
-	WM_keymap_add_item(keymap, "ANIM_OT_start_frame_set", SKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "ANIM_OT_end_frame_set", EKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "TIME_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
-#ifdef WITH_INPUT_NDOF
-	WM_keymap_add_item(keymap, "TIME_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
-#endif
-	WM_keymap_add_item(keymap, "TIME_OT_view_frame", PAD0, KM_PRESS, 0, 0);
-}
-