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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_subdivision.cc')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_subdivision.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
index 2653035a39f..c859a72b371 100644
--- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc
+++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
@@ -1162,8 +1162,8 @@ static void draw_subdiv_ubo_update_and_bind(const DRWSubdivCache *cache,
GPU_uniformbuf_update(cache->ubo, &storage);
- const int location = GPU_shader_get_uniform_block(shader, "shader_data");
- GPU_uniformbuf_bind(cache->ubo, location);
+ const int binding = GPU_shader_get_uniform_block_binding(shader, "shader_data");
+ GPU_uniformbuf_bind(cache->ubo, binding);
}
/** \} */
@@ -1942,7 +1942,9 @@ static bool draw_subdiv_create_requested_buffers(const Scene *scene,
return false;
}
- const bool optimal_display = (smd->flags & eSubsurfModifierFlag_ControlEdges);
+ /* Edges which do not come from coarse edges should not be drawn in edit mode, only in object
+ * mode when optimal display in turned off. */
+ const bool optimal_display = (smd->flags & eSubsurfModifierFlag_ControlEdges) || is_editmode;
draw_cache->bm = bm;
draw_cache->mesh = mesh_eval;