Revision: 46834
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46834
Author: campbellbarton
Date: 2012-05-21 09:00:35 +0000 (Mon, 21 May 2012)
Log Message:
-----------
code cleanup: remove some old comments
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-05-21 08:24:03 UTC (rev 46833)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-05-21 09:00:35 UTC (rev 46834)
@@ -580,7 +580,7 @@
fly->pan_view = TRUE;
break;
case FLY_MODAL_PAN_DISABLE:
-//XXX2.5 warp_pointer(cent_orig[0], cent_orig[1]);
+//XXX2.5 WM_cursor_warp(CTX_wm_window(C),
cent_orig[0], cent_orig[1]);
fly->pan_view = FALSE;
break;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2012-05-21 08:24:03 UTC (rev 46833)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2012-05-21 09:00:35 UTC (rev 46834)
@@ -333,8 +333,9 @@
retval = BKE_READ_EXOTIC_OK_BLEND;
}
else {
- //XXX waitcursor(1);
#if 0 /* historic stuff - no longer used */
+ WM_cursor_wait(TRUE);
+
if (is_foo_format(name)) {
read_foo(name);
retval = BKE_READ_EXOTIC_OK_OTHER;
@@ -344,7 +345,9 @@
{
retval = BKE_READ_EXOTIC_FAIL_FORMAT;
}
- //XXX waitcursor(0);
+#if 0
+ WM_cursor_wait(FALSE);
+#endif
}
}
}
@@ -393,8 +396,6 @@
/* match the read WM with current WM */
wm_window_match_do(C, &wmbase);
WM_check(C); /* opens window(s), checks keymaps */
-
-// XXX mainwindow_set_filename_to_title(G.main->name);
if (retval == BKE_READ_FILE_OK_USERPREFS) {
/* in case a userdef is read from regular .blend */
@@ -453,7 +454,6 @@
}
#endif
- // XXX undo_editmode_clear();
BKE_reset_undo();
BKE_write_undo(C, "original"); /* save current state */
}
@@ -546,8 +546,7 @@
/* XXX */
G.save_over = 0; // start with save preference untitled.blend
G.fileflags &= ~G_FILE_AUTOPLAY; /* disable autoplay in
startup.blend... */
-// mainwindow_set_filename_to_title(""); // empty string re-initializes
title to "Blender"
-
+
// refresh_interface_font();
// undo_editmode_clear();
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2012-05-21 08:24:03 UTC (rev
46833)
+++ trunk/blender/source/creator/creator.c 2012-05-21 09:00:35 UTC (rev
46834)
@@ -31,18 +31,18 @@
#if defined(__linux__) && defined(__GNUC__)
-#define _GNU_SOURCE
-#include <fenv.h>
+# define _GNU_SOURCE
+# include <fenv.h>
#endif
#if (defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)))
-#define OSX_SSE_FPE
-#include <xmmintrin.h>
+# define OSX_SSE_FPE
+# include <xmmintrin.h>
#endif
#ifdef WIN32
-#include <Windows.h>
-#include "utfconv.h"
+# include <Windows.h>
+# include "utfconv.h"
#endif
#include <stdlib.h>
@@ -105,30 +105,30 @@
#include "BLI_scanfill.h" /* for BLI_setErrorCallBack, TODO, move elsewhere */
#ifdef WITH_BUILDINFO_HEADER
-#define BUILD_DATE
+# define BUILD_DATE
#endif
/* for passing information between creator and gameengine */
#ifdef WITH_GAMEENGINE
-#include "BL_System.h"
+# include "BL_System.h"
#else /* dummy */
-#define SYS_SystemHandle int
+# define SYS_SystemHandle int
#endif
#include <signal.h>
#ifdef __FreeBSD__
-# include <sys/types.h>
-# include <floatingpoint.h>
-# include <sys/rtprio.h>
+# include <sys/types.h>
+# include <floatingpoint.h>
+# include <sys/rtprio.h>
#endif
#ifdef WITH_BINRELOC
-#include "binreloc.h"
+# include "binreloc.h"
#endif
#ifdef WITH_LIBMV
-#include "libmv-capi.h"
+# include "libmv-capi.h"
#endif
/* from buildinfo.c */
@@ -1178,18 +1178,17 @@
#ifdef WITH_PYTHON_MODULE
/* allow python module to call main */
-#define main main_python_enter
+# define main main_python_enter
static void *evil_C = NULL;
-#ifdef __APPLE__
-/* environ is not available in mac shared libraries */
-#include <crt_externs.h>
+# ifdef __APPLE__
+ /* environ is not available in mac shared libraries */
+# include <crt_externs.h>
char **environ = NULL;
+# endif
#endif
-#endif
-
#ifdef WIN32
int main(int argc, const char **UNUSED(argv_c)) /* Do not mess with const */
#else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
