Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-13 19:07:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-13 19:07:57 +0400
commit8e6c654294bd0bcde4c044a6be649262b7b4e507 (patch)
treed70a08626b1be683ab49e0561412a0e74582a518 /source
parentf35efbc95af7bb85adeb19c451e492daf477683d (diff)
[#22884] slow import wavefont/.obj file
- dont run mesh update functions on zero user meshes (a bit of a cheap trick but works well), made in last commit by mistake. - dont do a scenegraph update on linking an object, run scene.update() after linking objects. - remove split material option since we have enough slots.
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index ca388951e68..0526263de9b 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -207,7 +207,8 @@ static Base *rna_Scene_object_link(Scene *scene, bContext *C, ReportList *report
ob->recalc |= OB_RECALC_ALL;
- DAG_scene_sort(G.main, scene);
+ /* slows down importers too much, run scene.update() */
+ /* DAG_scene_sort(G.main, scene); */
return base;
}
@@ -2827,7 +2828,7 @@ static void rna_def_scene_objects(BlenderRNA *brna, PropertyRNA *cprop)
RNA_def_struct_ui_text(srna, "Scene Objects", "Collection of scene objects");
func= RNA_def_function(srna, "link", "rna_Scene_object_link");
- RNA_def_function_ui_description(func, "Link object to scene.");
+ RNA_def_function_ui_description(func, "Link object to scene, run scene.update() after.");
RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
parm= RNA_def_pointer(func, "object", "Object", "", "Object to add to scene.");
RNA_def_property_flag(parm, PROP_REQUIRED);