[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45622] trunk/blender/source/creator/ creator.c: Silencing some compiler warnings on Windows
Joshua Leung
aligorith at gmail.com
Sat Apr 14 13:58:52 CEST 2012
Revision: 45622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45622
Author: aligorith
Date: 2012-04-14 11:58:52 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Silencing some compiler warnings on Windows
argv is defined as "char *" here so that unicode magic can happen causing
problems later on when "const char**" is expected instead. While this fix is
redundant on other platforms, it's a lot less confusing than some of the
alternative fixes.
Modified Paths:
--------------
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2012-04-14 10:46:47 UTC (rev 45621)
+++ trunk/blender/source/creator/creator.c 2012-04-14 11:58:52 UTC (rev 45622)
@@ -1256,7 +1256,7 @@
#endif
/* first test for background */
- ba = BLI_argsInit(argc, argv); /* skip binary path */
+ ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */
setupArguments(C, ba, &syshandle);
BLI_argsParse(ba, 1, NULL, NULL);
@@ -1281,7 +1281,7 @@
BLI_argsParse(ba, 2, NULL, NULL);
BLI_argsParse(ba, 3, NULL, NULL);
- WM_init(C, argc, argv);
+ WM_init(C, argc, (const char **)argv);
/* this is properly initialized with user defs, but this is default */
/* call after loading the startup.blend so we can read U.tempdir */
@@ -1294,7 +1294,7 @@
else {
BLI_argsParse(ba, 3, NULL, NULL);
- WM_init(C, argc, argv);
+ WM_init(C, argc, (const char **)argv);
/* don't use user preferences temp dir */
BLI_init_temporary_dir(NULL);
More information about the Bf-blender-cvs
mailing list