sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix [#22027] Group disappears in render after adding a group instance

Browse Source
This commit is contained in:
Campbell Barton 2010-07-27 04:02:09 +00:00
parent 12a695ae47
commit db6f1f52a7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/object/object_add.c
View File

@ -756,7 +756,10 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
ob->transflag |= OB_DUPLIGROUP;
id_lib_extern(&group->id);
WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
/* works without this except if you try render right after, see: 22027 */
DAG_scene_sort(CTX_data_scene(C));
WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, CTX_data_scene(C));
return OPERATOR_FINISHED;
}

4
source/blender/python/intern/bpy_interface.c
View File

@ -207,7 +207,9 @@ void BPY_start_python_path(void)
{
static wchar_t py_path_bundle_wchar[FILE_MAX];
/* mbstowcs(py_path_bundle_wchar, py_path_bundle, FILE_MAXDIR); */ /* cant use this, on linux gives bug: #23018 */
/* cant use this, on linux gives bug: #23018, TODO: try LANG="en_US.UTF-8" /usr/bin/blender, suggested 22008 */
/* mbstowcs(py_path_bundle_wchar, py_path_bundle, FILE_MAXDIR); */
utf8towchar(py_path_bundle_wchar, py_path_bundle);
Py_SetPythonHome(py_path_bundle_wchar);