diff options
| author | Juan Linietsky | 2015-06-06 11:09:00 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-06-06 11:09:00 -0300 |
| commit | 954256268afe89b648d356ee0b296a9e97a07373 (patch) | |
| tree | 36c42fb01f05d26bbae438d470676c9487b47a04 /servers/visual/visual_server_wrap_mt.cpp | |
| parent | 0e1510214a7585d5446f06344468ab52298cfa81 (diff) | |
| parent | ab99671bb835a5fe24a092ec34afe1ad862ac254 (diff) | |
| download | godot-954256268afe89b648d356ee0b296a9e97a07373.tar.gz godot-954256268afe89b648d356ee0b296a9e97a07373.tar.zst godot-954256268afe89b648d356ee0b296a9e97a07373.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/motion/engine.cfg
Diffstat (limited to 'servers/visual/visual_server_wrap_mt.cpp')
| -rw-r--r-- | servers/visual/visual_server_wrap_mt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp index a044981bb..44a41a93d 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/visual/visual_server_wrap_mt.cpp @@ -187,8 +187,8 @@ VisualServerWrapMT::VisualServerWrapMT(VisualServer* p_contained,bool p_create_t draw_pending=0; draw_thread_up=false; alloc_mutex=Mutex::create(); - texture_pool_max_size=GLOBAL_DEF("render/thread_textures_prealloc",20); - mesh_pool_max_size=GLOBAL_DEF("render/thread_meshes_prealloc",20); + texture_pool_max_size=GLOBAL_DEF("render/thread_textures_prealloc",5); + mesh_pool_max_size=GLOBAL_DEF("core/rid_pool_prealloc",20); if (!p_create_thread) { server_thread=Thread::get_caller_ID(); } else { |