Commit: cd6178e5849586f791bd94e51d0e9272cd3da1ad
Author: Campbell Barton
Date: Fri Jan 29 14:31:29 2016 +1100
Branches: master
https://developer.blender.org/rBcd6178e5849586f791bd94e51d0e9272cd3da1ad
Cleanup: remove unused code
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/windowmanager/intern/wm_playanim.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c
b/source/blender/editors/space_sequencer/sequencer_edit.c
index 9d96226..54e9b65 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -35,7 +35,6 @@
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
-#include "BLI_fileops.h"
#include "BLI_ghash.h"
#include "BLI_math.h"
#include "BLI_timecode.h"
@@ -929,37 +928,6 @@ static bool sequence_offset_after_frame(Scene *scene,
const int delta, const int
return done;
}
-static void UNUSED_FUNCTION(touch_seq_files) (Scene *scene)
-{
- Sequence *seq;
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- char str[256];
-
- /* touch all strips with movies */
-
- if (ed == NULL) return;
-
- // XXX25 if (okee("Touch and print selected movies")==0) return;
-
- WM_cursor_wait(1);
-
- SEQP_BEGIN (ed, seq)
- {
- if (seq->flag & SELECT) {
- if (seq->type == SEQ_TYPE_MOVIE) {
- if (seq->strip && seq->strip->stripdata) {
- BLI_make_file_string(G.main->name, str,
seq->strip->dir, seq->strip->stripdata->name);
- BLI_file_touch(seq->name);
- }
- }
-
- }
- }
- SEQ_END
-
- WM_cursor_wait(0);
-}
-
#if 0
static void set_filter_seq(Scene *scene)
{
diff --git a/source/blender/windowmanager/intern/wm_playanim.c
b/source/blender/windowmanager/intern/wm_playanim.c
index eadb875..675958c 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -1238,12 +1238,6 @@ static char *wm_main_playanim_intern(int argc, const
char **argv)
exit(1);
}
-#if 0 //XXX25
-#if !defined(WIN32) && !defined(__APPLE__)
- if (fork()) exit(0);
-#endif
-#endif //XXX25
-
{
GHOST_EventConsumerHandle consumer =
GHOST_CreateEventConsumer(ghost_event_proc, &ps);
@@ -1528,15 +1522,11 @@ static char *wm_main_playanim_intern(int argc, const
char **argv)
AUD_Sound_free(source);
source = NULL;
#endif
-
-#if 0 // XXX25
- free_blender();
-#else
/* we still miss freeing a lot!,
* but many areas could skip initialization too for anim play */
BLF_exit();
-#endif
+
GHOST_DisposeWindow(g_WS.ghost_system, g_WS.ghost_window);
/* early exit, IMB and BKE should be exited only in end */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
