Commit: ebebc4ded11e8ecb38b57aa47f5ba80d26b9567c
Author: Campbell Barton
Date: Wed Jun 3 17:08:28 2015 +1000
Branches: master
https://developer.blender.org/rBebebc4ded11e8ecb38b57aa47f5ba80d26b9567c
Correct own fix reference before assignment
3rd fix for silly exception conversion!
===================================================================
M source/blender/python/intern/bpy_util.c
===================================================================
diff --git a/source/blender/python/intern/bpy_util.c
b/source/blender/python/intern/bpy_util.c
index e4571e7..e876adf 100644
--- a/source/blender/python/intern/bpy_util.c
+++ b/source/blender/python/intern/bpy_util.c
@@ -121,9 +121,12 @@ bool BPy_errors_to_report_ex(ReportList *reports, const
bool use_full, const boo
}
#if 0 /* ARG!. workaround for a bug in blenders use of vsnprintf */
- BKE_reportf(reports, RPT_ERROR, "%s\nlocation: %s:%d\n",
cstring, filename, lineno);
+ BKE_reportf(reports, RPT_ERROR, "%s\nlocation: %s:%d\n",
_PyUnicode_AsString(pystring), filename, lineno);
#else
- pystring_format = PyUnicode_FromFormat(TIP_("%s\nlocation:
%s:%d\n"), cstring, filename, lineno);
+ pystring_format = PyUnicode_FromFormat(
+ TIP_("%s\nlocation: %s:%d\n"),
+ _PyUnicode_AsString(pystring), filename, lineno);
+
cstring = _PyUnicode_AsString(pystring_format);
BKE_report(reports, RPT_ERROR, cstring);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
