diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-12-01 22:35:45 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-12-01 22:35:45 +0400 |
| commit | 5983bbe3c90c9621fd7c26047245e93139331652 (patch) | |
| tree | 3bf094e860c4a298b83c0998db4985227858803d /source/blender/makesrna/RNA_access.h | |
| parent | 6bdd65ca73d838a35bff01f3c48c9f6a7d0acac7 (diff) | |
Fix for [#29472] ctrl F in edition causes crash
MSVC is not C99-compliant, but with the macro as it was, the "args" part was consuming and dropping one of the params, so the format string wanted N extra args, and there were only N-1... boom, crash! Without "args" this works correctly (checked on MSVC10 release build)
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index bc82d9aaeb0..8614d54156d 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -1001,7 +1001,7 @@ StructRNA *ID_code_to_RNA_type(short idcode); #ifdef __GNUC__ # define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args) #else -# define RNA_warning(format, args, ...) _RNA_warning("%s: " format "\n", __FUNCTION__, __VA_ARGS__) +# define RNA_warning(format, ...) _RNA_warning("%s: " format "\n", __FUNCTION__, __VA_ARGS__) #endif void _RNA_warning(const char *format, ...) |