Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup: for creator.c & more useful assert message (file:line)

Browse Source
This commit is contained in:
Campbell Barton
2012-03-28 05:09:50 +00:00
parent 07065b27b8
commit 711d7539e0
2 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_utildefines.h
View File

@@ -293,8 +293,8 @@
(void)((!(a)) ? ( \ (void)((!(a)) ? ( \
( \ ( \
fprintf(stderr, \ fprintf(stderr, \
"BLI_assert failed: %s, %s(), %d at \'%s\'\n", \ "BLI_assert failed: %s:%d, %s(), at \'%s\'\n", \
__FILE__, __func__, __LINE__, STRINGIFY(a)), \ __FILE__, __LINE__, __func__, STRINGIFY(a)), \
_BLI_DUMMY_ABORT(), \ _BLI_DUMMY_ABORT(), \
NULL)) : NULL) NULL)) : NULL)
# else # else
@@ -302,7 +302,7 @@
(void)((!(a)) ? ( \ (void)((!(a)) ? ( \
( \ ( \
fprintf(stderr, \ fprintf(stderr, \
"BLI_assert failed: %s, %d at \'%s\'\n", \ "BLI_assert failed: %s:%d, at \'%s\'\n", \
__FILE__, __LINE__, STRINGIFY(a)), \ __FILE__, __LINE__, STRINGIFY(a)), \
_BLI_DUMMY_ABORT(), \ _BLI_DUMMY_ABORT(), \
NULL)) : NULL) NULL)) : NULL)

12
source/creator/creator.c
View File

@@ -59,7 +59,7 @@
#include "BLI_args.h" #include "BLI_args.h"
#include "BLI_threads.h" #include "BLI_threads.h"
#include "BLI_scanfill.h" // for BLI_setErrorCallBack, TODO, move elsewhere #include "BLI_scanfill.h" /* for BLI_setErrorCallBack, TODO, move elsewhere */
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BLI_callbacks.h" #include "BLI_callbacks.h"
@@ -72,7 +72,7 @@
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
#include "BKE_blender.h" #include "BKE_blender.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_depsgraph.h" // for DAG_on_visible_update #include "BKE_depsgraph.h" /* for DAG_on_visible_update */
#include "BKE_font.h" #include "BKE_font.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_main.h" #include "BKE_main.h"
@@ -84,7 +84,7 @@
#include "BKE_sound.h" #include "BKE_sound.h"
#include "BKE_image.h" #include "BKE_image.h"
#include "IMB_imbuf.h" // for IMB_init #include "IMB_imbuf.h" /* for IMB_init */
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
#include "BPY_extern.h" #include "BPY_extern.h"
@@ -130,7 +130,7 @@
#include "libmv-capi.h" #include "libmv-capi.h"
#endif #endif
// from buildinfo.c /* from buildinfo.c */
#ifdef BUILD_DATE #ifdef BUILD_DATE
extern char build_date[]; extern char build_date[];
extern char build_time[]; extern char build_time[];
@@ -466,7 +466,7 @@ static int without_borders(int UNUSED(argc), const char **UNUSED(argv), void *UN
return 0; return 0;
} }
extern int wm_start_with_console; // blender/windowmanager/intern/wm_init_exit.c extern int wm_start_with_console; /* wm_init_exit.c */
static int start_with_console(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) static int start_with_console(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{ {
wm_start_with_console = 1; wm_start_with_console = 1;
@@ -1197,7 +1197,7 @@ int main(int argc, const char **argv)
fpsetmask(0); fpsetmask(0);
#endif #endif
// initialize path to executable /* initialize path to executable */
BLI_init_program_path(argv[0]); BLI_init_program_path(argv[0]);
BLI_threadapi_init(); BLI_threadapi_init();