blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.3-release'

This commit is contained in:
Jeroen Bakker 2022-08-02 13:42:14 +02:00
parent 33e4ecc750 78ad9ebed3
commit 4e2af28bc7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/intern/draw_cache_impl_mesh.cc
View File

@ -1893,6 +1893,7 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph,
ob->obmat,
true,
false,
do_cage,
ts,
use_hide);
}

8
source/blender/draw/intern/draw_cache_impl_subdivision.cc
View File

@ -2019,6 +2019,7 @@ static bool draw_subdiv_create_requested_buffers(Object *ob,
const float obmat[4][4],
const bool do_final,
const bool do_uvedit,
const bool do_cage,
const ToolSettings *ts,
const bool use_hide,
OpenSubdiv_EvaluatorCache *evaluator_cache)
@ -2062,9 +2063,8 @@ static bool draw_subdiv_create_requested_buffers(Object *ob,
return false;
}
/* 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 = runtime_data->use_optimal_display || is_editmode;
/* Edges which do not come from coarse edges should not be drawn in edit cage mode. */
const bool optimal_display = runtime_data->use_optimal_display || (is_editmode && !do_cage);
draw_cache->bm = bm;
draw_cache->mesh = mesh_eval;
@ -2216,6 +2216,7 @@ void DRW_create_subdivision(Object *ob,
const float obmat[4][4],
const bool do_final,
const bool do_uvedit,
const bool do_cage,
const ToolSettings *ts,
const bool use_hide)
{
@ -2239,6 +2240,7 @@ void DRW_create_subdivision(Object *ob,
obmat,
do_final,
do_uvedit,
do_cage,
ts,
use_hide,
g_evaluator_cache)) {

1
source/blender/draw/intern/draw_subdivision.h
View File

@ -199,6 +199,7 @@ void DRW_create_subdivision(struct Object *ob,
const float obmat[4][4],
const bool do_final,
const bool do_uvedit,
const bool do_cage,
const ToolSettings *ts,
const bool use_hide);