Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-embree3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-embree3
Commits
c85a58ab
Commit
c85a58ab
authored
9 years ago
by
Sergey Sharybin
Browse files
Options
Downloads
Patches
Plain Diff
Blender 2.75: Fix compilation error caused by the addons fix
It was relying on a new function introduced by in
958c2087
.
parent
6920d4c0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/blender/python/BPY_extern.h
+1
-0
1 addition, 0 deletions
source/blender/python/BPY_extern.h
source/blender/python/intern/bpy_interface.c
+6
-2
6 additions, 2 deletions
source/blender/python/intern/bpy_interface.c
with
7 additions
and
2 deletions
source/blender/python/BPY_extern.h
+
1
−
0
View file @
c85a58ab
...
...
@@ -86,6 +86,7 @@ void BPY_driver_reset(void);
float
BPY_driver_exec
(
struct
ChannelDriver
*
driver
,
const
float
evaltime
);
int
BPY_button_exec
(
struct
bContext
*
C
,
const
char
*
expr
,
double
*
value
,
const
bool
verbose
);
int
BPY_string_exec_ex
(
struct
bContext
*
C
,
const
char
*
expr
,
bool
use_eval
);
int
BPY_string_exec
(
struct
bContext
*
C
,
const
char
*
expr
);
void
BPY_DECREF
(
void
*
pyob_ptr
);
/* Py_DECREF() */
...
...
This diff is collapsed.
Click to expand it.
source/blender/python/intern/bpy_interface.c
+
6
−
2
View file @
c85a58ab
...
...
@@ -607,7 +607,7 @@ int BPY_button_exec(bContext *C, const char *expr, double *value, const bool ver
return
error_ret
;
}
int
BPY_string_exec
(
bContext
*
C
,
const
char
*
expr
)
int
BPY_string_exec
_ex
(
bContext
*
C
,
const
char
*
expr
,
bool
use_eval
)
{
PyGILState_STATE
gilstate
;
PyObject
*
main_mod
=
NULL
;
...
...
@@ -630,7 +630,7 @@ int BPY_string_exec(bContext *C, const char *expr)
bmain_back
=
bpy_import_main_get
();
bpy_import_main_set
(
CTX_data_main
(
C
));
retval
=
PyRun_String
(
expr
,
Py_eval
_input
,
py_dict
,
py_dict
);
retval
=
PyRun_String
(
expr
,
use_eval
?
Py_eval_input
:
Py_file
_input
,
py_dict
,
py_dict
);
bpy_import_main_set
(
bmain_back
);
...
...
@@ -650,6 +650,10 @@ int BPY_string_exec(bContext *C, const char *expr)
return
error_ret
;
}
int
BPY_string_exec
(
bContext
*
C
,
const
char
*
expr
)
{
return
BPY_string_exec_ex
(
C
,
expr
,
true
);
}
void
BPY_modules_load_user
(
bContext
*
C
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment