Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- use Py_CLEAR for python internally referencing other PyObjects (supposed to be safer).

Browse Source 
- detect includes for qtcreator projects as well as the ones from cmake (it didnt return all of the right paths).
This commit is contained in:
Campbell Barton
2011-02-27 04:01:58 +00:00
parent a11c80d3bb
commit f73c993b16
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/cmake/cmake_qtcreator_project.py
View File

@@ -171,6 +171,11 @@ def main():
else: else:
includes, defines = cmake_advanced_info() includes, defines = cmake_advanced_info()
# for some reason it doesnt give all internal includes
includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
includes.sort()
PROJECT_NAME = "Blender" PROJECT_NAME = "Blender"
f = open(join(base, "%s.files" % PROJECT_NAME), 'w') f = open(join(base, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel)) f.write("\n".join(files_rel))

2
source/blender/editors/space_action/action_edit.c
View File

@@ -167,7 +167,7 @@ static int act_markers_make_local_poll(bContext *C)
return ED_markers_get_first_selected(ED_context_get_markers(C)) != NULL; return ED_markers_get_first_selected(ED_context_get_markers(C)) != NULL;
} }
static int act_markers_make_local_exec (bContext *C, wmOperator *op) static int act_markers_make_local_exec (bContext *C, wmOperator *UNUSED(op))
{ {
ListBase *markers = ED_context_get_markers(C); ListBase *markers = ED_context_get_markers(C);

3
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@@ -157,7 +157,8 @@ KX_GameObject::~KX_GameObject()
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
if (m_attr_dict) { if (m_attr_dict) {
PyDict_Clear(m_attr_dict); /* incase of circular refs or other weired cases */ PyDict_Clear(m_attr_dict); /* incase of circular refs or other weired cases */
Py_DECREF(m_attr_dict); /* Py_CLEAR: Py_DECREF's and NULL's */
Py_CLEAR(m_attr_dict);
} }
#endif // WITH_PYTHON #endif // WITH_PYTHON
} }

8
source/gameengine/Ketsji/KX_Scene.cpp
View File

@@ -269,10 +269,12 @@ KX_Scene::~KX_Scene()
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
PyDict_Clear(m_attr_dict); PyDict_Clear(m_attr_dict);
Py_DECREF(m_attr_dict); /* Py_CLEAR: Py_DECREF's and NULL's */
Py_CLEAR(m_attr_dict);
Py_XDECREF(m_draw_call_pre); /* these may be NULL but the macro checks */
Py_XDECREF(m_draw_call_post); Py_CLEAR(m_draw_call_pre);
Py_CLEAR(m_draw_call_post);
#endif #endif
} }