[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30790] trunk/blender/source/blender: bugfix [#22027] Group disappears in render after adding a group instance

[Campbell Barton]

Revision: 30790
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30790
Author:   campbellbarton
Date:     2010-07-27 06:02:09 +0200 (Tue, 27 Jul 2010)

Log Message:
-----------
bugfix [#22027] Group disappears in render after adding a group instance

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-07-27 02:41:30 UTC (rev 30789)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-07-27 04:02:09 UTC (rev 30790)
@@ -756,8 +756,11 @@
 		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;
 	}
 

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2010-07-27 02:41:30 UTC (rev 30789)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2010-07-27 04:02:09 UTC (rev 30790)
@@ -207,7 +207,9 @@
 	{
 		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);