diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/creator | |
parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator_args.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index d2f45071496..863a88aeb2a 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -883,7 +883,7 @@ static const char arg_handle_debug_mode_generic_set_doc_gpumem[] = static int arg_handle_debug_mode_generic_set(int UNUSED(argc), const char **UNUSED(argv), void *data) { - G.debug |= GET_INT_FROM_POINTER(data); + G.debug |= POINTER_AS_INT(data); return 0; } |