[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42320] branches/bmesh/blender/source/ blender/makesrna/RNA_access.h: Fix for [#29472] ctrl F in edition causes crash

Andrew Wiggin ender79bl at gmail.com
Thu Dec 1 19:35:46 CET 2011


Revision: 42320
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42320
Author:   ender79
Date:     2011-12-01 18:35:45 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
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)

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h

Modified: branches/bmesh/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/RNA_access.h	2011-12-01 18:26:57 UTC (rev 42319)
+++ branches/bmesh/blender/source/blender/makesrna/RNA_access.h	2011-12-01 18:35:45 UTC (rev 42320)
@@ -1001,7 +1001,7 @@
 #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, ...)




More information about the Bf-blender-cvs mailing list