[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55206] trunk/blender/source/blender/ editors/space_text: fix own regression in 2.66 [#34610] Text editor: Syntax highlighting freezes
Campbell Barton
ideasman42 at gmail.com
Tue Mar 12 09:46:12 CET 2013
Revision: 55206
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55206
Author: campbellbarton
Date: 2013-03-12 08:46:12 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
fix own regression in 2.66 [#34610] Text editor: Syntax highlighting freezes
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_text/text_format.c
trunk/blender/source/blender/editors/space_text/text_format_lua.c
trunk/blender/source/blender/editors/space_text/text_format_osl.c
trunk/blender/source/blender/editors/space_text/text_format_py.c
Modified: trunk/blender/source/blender/editors/space_text/text_format.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format.c 2013-03-12 08:24:36 UTC (rev 55205)
+++ trunk/blender/source/blender/editors/space_text/text_format.c 2013-03-12 08:46:12 UTC (rev 55206)
@@ -144,7 +144,7 @@
* Fill the string with formatting constant,
* advancing \a str_p and \a fmt_p
*
- * \param len length in bytes
+ * \param len length in bytes of \a fmt_p to fill.
*/
void text_format_fill(const char **str_p, char **fmt_p, const char type, const int len)
{
Modified: trunk/blender/source/blender/editors/space_text/text_format_lua.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_lua.c 2013-03-12 08:24:36 UTC (rev 55205)
+++ trunk/blender/source/blender/editors/space_text/text_format_lua.c 2013-03-12 08:46:12 UTC (rev 55206)
@@ -237,7 +237,7 @@
}
/* Single line comment */
else if (*str == '-' && *(str + 1) == '-') {
- text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(str - fs.buf));
+ text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(fmt - line->format));
}
else if (*str == '"' || *str == '\'') {
/* Strings */
Modified: trunk/blender/source/blender/editors/space_text/text_format_osl.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_osl.c 2013-03-12 08:24:36 UTC (rev 55205)
+++ trunk/blender/source/blender/editors/space_text/text_format_osl.c 2013-03-12 08:46:12 UTC (rev 55206)
@@ -252,7 +252,7 @@
/* Deal with comments first */
if (*str == '/' && *(str + 1) == '/') {
/* fill the remaining line */
- text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(str - fs.buf));
+ text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(fmt - line->format));
}
/* C-Style (multi-line) comments */
else if (*str == '/' && *(str + 1) == '*') {
Modified: trunk/blender/source/blender/editors/space_text/text_format_py.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_py.c 2013-03-12 08:24:36 UTC (rev 55205)
+++ trunk/blender/source/blender/editors/space_text/text_format_py.c 2013-03-12 08:46:12 UTC (rev 55206)
@@ -233,7 +233,7 @@
/* Deal with comments first */
if (*str == '#') {
/* fill the remaining line */
- text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(str - fs.buf));
+ text_format_fill(&str, &fmt, FMT_TYPE_COMMENT, len - (int)(fmt - line->format));
}
else if (*str == '"' || *str == '\'') {
/* Strings */
More information about the Bf-blender-cvs
mailing list