blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix text editor failure to move the cursor for syntax errors 

This broke between 3.0 and 3.1, upgrading to Python 3.10 seems the
likely cause as this code didn't change.
This commit is contained in:
Campbell Barton 2022-03-28 16:37:09 +11:00 committed by Philipp Oeser
parent fb2cb0324a
commit 694e20b141
Notes: blender-bot 2023-02-14 05:53:42 +01:00 
Referenced by issue #96241, 3.1: Potential candidates for corrective releases
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/python/intern/bpy_interface_run.c
View File

@ -49,11 +49,11 @@
/** \name Private Utilities
* \{ */
static void python_script_error_jump_text(Text *text)
static void python_script_error_jump_text(Text *text, const char *filepath)
{
int lineno;
int offset;
python_script_error_jump(text->id.name + 2, &lineno, &offset);
python_script_error_jump(filepath, &lineno, &offset);
if (lineno != -1) {
/* select the line with the error */
txt_move_to(text, lineno - 1, INT_MAX, false);
@ -96,6 +96,10 @@ static bool python_script_exec(
PyObject *py_dict = NULL, *py_result = NULL;
PyGILState_STATE gilstate;
char fn_dummy[FILE_MAX];
/** The `__file__` added into the name-space. */
const char *fn_namespace = NULL;
BLI_assert(fn || text);
if (fn == NULL && text == NULL) {
@ -107,8 +111,8 @@ static bool python_script_exec(
PyC_MainModule_Backup(&main_mod);
if (text) {
char fn_dummy[FILE_MAXDIR];
bpy_text_filename_get(fn_dummy, bmain_old, sizeof(fn_dummy), text);
fn_namespace = fn_dummy;
if (text->compiled == NULL) { /* if it wasn't already compiled, do it now */
char *buf;
@ -124,7 +128,7 @@ static bool python_script_exec(
if (PyErr_Occurred()) {
if (do_jump) {
python_script_error_jump_text(text);
python_script_error_jump_text(text, fn_namespace);
}
BPY_text_free_code(text);
}
@ -137,6 +141,7 @@ static bool python_script_exec(
}
else {
FILE *fp = BLI_fopen(fn, "r");
fn_namespace = fn;
if (fp) {
py_dict = PyC_DefaultNameSpace(fn);
@ -183,7 +188,7 @@ static bool python_script_exec(
/* ensure text is valid before use, the script may have freed itself */
Main *bmain_new = CTX_data_main(C);
if ((bmain_old == bmain_new) && (BLI_findindex(&bmain_new->texts, text) != -1)) {
python_script_error_jump_text(text);
python_script_error_jump_text(text, fn_namespace);
}
}
}