diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-29 13:49:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-09-29 13:49:34 -0300 |
| commit | 0de8309b2c38306a2c05f8f239fa423bc1b7899b (patch) | |
| tree | 15874ca683f7d200ccf3e02d9d8f6298c95a81c6 /drivers/gles2/rasterizer_storage_gles2.cpp | |
| parent | 6cbdeedf57c7383827416da19b6026e3721f2812 (diff) | |
Many fixes to GLES2 renderer, fixed compilation issues in GLES3 shaders.
Diffstat (limited to 'drivers/gles2/rasterizer_storage_gles2.cpp')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index bf51fcc027..0863e03b76 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -2624,10 +2624,10 @@ void RasterizerStorageGLES2::update_dirty_multimeshes() { if (multimesh->mesh.is_valid()) { mesh_aabb = mesh_get_aabb(multimesh->mesh, RID()); - } else { - mesh_aabb.size += Vector3(0.001, 0.001, 0.001); } + mesh_aabb.size += Vector3(0.001, 0.001, 0.001); //in case mesh is empty in one of the sides + int stride = multimesh->color_floats + multimesh->xform_floats + multimesh->custom_data_floats; int count = multimesh->data.size(); float *data = multimesh->data.ptrw(); @@ -3781,7 +3781,7 @@ void RasterizerStorageGLES2::instance_remove_skeleton(RID p_skeleton, Rasterizer void RasterizerStorageGLES2::instance_add_dependency(RID p_base, RasterizerScene::InstanceBase *p_instance) { - Instanciable *inst = NULL; + Instantiable *inst = NULL; switch (p_instance->base_type) { case VS::INSTANCE_MESH: { inst = mesh_owner.getornull(p_base); @@ -3827,7 +3827,7 @@ void RasterizerStorageGLES2::instance_add_dependency(RID p_base, RasterizerScene void RasterizerStorageGLES2::instance_remove_dependency(RID p_base, RasterizerScene::InstanceBase *p_instance) { - Instanciable *inst = NULL; + Instantiable *inst = NULL; switch (p_instance->base_type) { case VS::INSTANCE_MESH: { @@ -4542,6 +4542,7 @@ void RasterizerStorageGLES2::update_dirty_resources() { update_dirty_shaders(); update_dirty_materials(); update_dirty_skeletons(); + update_dirty_multimeshes(); } RasterizerStorageGLES2::RasterizerStorageGLES2() { |