From a9a4bcc3d14af907dd8001735789717cb8721422 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 30 May 2022 16:10:22 +0200 Subject: Fix building: stub for OpenSubdiv Building problem introduced on 24e74f8bef813820. It affects `make lite` and other builds that skip OpenSubdiv. --- intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc index 78c1d23d2cc..bc39326b57d 100644 --- a/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc +++ b/intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc @@ -23,8 +23,7 @@ OpenSubdiv_Evaluator *openSubdiv_createEvaluatorFromTopologyRefiner( struct OpenSubdiv_TopologyRefiner * /*topology_refiner*/, eOpenSubdivEvaluator /*evaluator_type*/, - OpenSubdiv_EvaluatorCache * /*evaluator_cache*/, - const OpenSubdiv_EvaluatorSettings * /*settings*/) + OpenSubdiv_EvaluatorCache * /*evaluator_cache*/) { return NULL; } -- cgit v1.2.3 From afd81e26af9e8179578873a22fb07965b648f458 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 30 May 2022 16:11:52 +0200 Subject: Fix T98446: Spreadsheets filter not working on Name column --- .../space_spreadsheet/spreadsheet_row_filter.cc | 48 ++++++++++------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc index eb8f111baa0..3ae4536b652 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc @@ -190,33 +190,29 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter, } else if (column_data.type().is()) { const StringRef value = row_filter.value_string; - switch (row_filter.operation) { - case SPREADSHEET_ROW_FILTER_EQUAL: { - apply_filter_operation( - column_data.typed(), - [&](const InstanceReference cell) { - switch (cell.type()) { - case InstanceReference::Type::Object: { - return value == (reinterpret_cast(cell.object()).name + 2); - } - case InstanceReference::Type::Collection: { - return value == (reinterpret_cast(cell.collection()).name + 2); - } - case InstanceReference::Type::GeometrySet: { - return false; - } - case InstanceReference::Type::None: { - return false; - } - } - BLI_assert_unreachable(); + + apply_filter_operation( + column_data.typed(), + [&](const InstanceReference cell) { + switch (cell.type()) { + case InstanceReference::Type::Object: { + return value == (reinterpret_cast(cell.object()).name + 2); + } + case InstanceReference::Type::Collection: { + return value == (reinterpret_cast(cell.collection()).name + 2); + } + case InstanceReference::Type::GeometrySet: { return false; - }, - prev_mask, - new_indices); - break; - } - } + } + case InstanceReference::Type::None: { + return false; + } + } + BLI_assert_unreachable(); + return false; + }, + prev_mask, + new_indices); } } -- cgit v1.2.3 From de610d06a6b7c169c44138717a54baa890105730 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 30 May 2022 16:17:25 +0200 Subject: Cleanup: make format --- .../shaders/common_subdiv_ibo_lines_comp.glsl | 13 ++++++----- .../shaders/common_subdiv_ibo_tris_comp.glsl | 26 +++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl index 5084dcc0746..3244b7960d8 100644 --- a/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl +++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl @@ -35,7 +35,8 @@ void emit_line(uint line_offset, uint quad_index, uint start_loop_index, uint co uint coarse_quad_index = coarse_polygon_index_from_subdiv_quad_index(quad_index, coarse_poly_count); - if (is_face_hidden(coarse_quad_index) || (input_origindex[vertex_index] == ORIGINDEX_NONE && optimal_display)) { + if (is_face_hidden(coarse_quad_index) || + (input_origindex[vertex_index] == ORIGINDEX_NONE && optimal_display)) { output_lines[line_offset + 0] = 0xffffffff; output_lines[line_offset + 1] = 0xffffffff; } @@ -62,13 +63,13 @@ void main() uint loop_index = num_subdiv_loops + index * 2; if (lines_loose_flags[index] != 0) { - /* Line is hidden. */ - output_lines[line_offset] = 0xffffffff; - output_lines[line_offset + 1] = 0xffffffff; + /* Line is hidden. */ + output_lines[line_offset] = 0xffffffff; + output_lines[line_offset + 1] = 0xffffffff; } else { - output_lines[line_offset] = loop_index; - output_lines[line_offset + 1] = loop_index + 1; + output_lines[line_offset] = loop_index; + output_lines[line_offset + 1] = loop_index + 1; } #else diff --git a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl index f1275b36c34..ce3c8478d3f 100644 --- a/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl +++ b/source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl @@ -46,19 +46,19 @@ void main() #endif if (is_face_hidden(coarse_quad_index)) { - output_tris[triangle_loop_index + 0] = 0xffffffff; - output_tris[triangle_loop_index + 1] = 0xffffffff; - output_tris[triangle_loop_index + 2] = 0xffffffff; - output_tris[triangle_loop_index + 3] = 0xffffffff; - output_tris[triangle_loop_index + 4] = 0xffffffff; - output_tris[triangle_loop_index + 5] = 0xffffffff; + output_tris[triangle_loop_index + 0] = 0xffffffff; + output_tris[triangle_loop_index + 1] = 0xffffffff; + output_tris[triangle_loop_index + 2] = 0xffffffff; + output_tris[triangle_loop_index + 3] = 0xffffffff; + output_tris[triangle_loop_index + 4] = 0xffffffff; + output_tris[triangle_loop_index + 5] = 0xffffffff; } else { - output_tris[triangle_loop_index + 0] = loop_index + 0; - output_tris[triangle_loop_index + 1] = loop_index + 1; - output_tris[triangle_loop_index + 2] = loop_index + 2; - output_tris[triangle_loop_index + 3] = loop_index + 0; - output_tris[triangle_loop_index + 4] = loop_index + 2; - output_tris[triangle_loop_index + 5] = loop_index + 3; - } + output_tris[triangle_loop_index + 0] = loop_index + 0; + output_tris[triangle_loop_index + 1] = loop_index + 1; + output_tris[triangle_loop_index + 2] = loop_index + 2; + output_tris[triangle_loop_index + 3] = loop_index + 0; + output_tris[triangle_loop_index + 4] = loop_index + 2; + output_tris[triangle_loop_index + 5] = loop_index + 3; + } } -- cgit v1.2.3 From 68562905147fff5fc3bc4288f3b3c8cfe4e40dc0 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Mon, 30 May 2022 16:33:52 +0200 Subject: Fix T98253: Gpencil Lineart crashes when undoing creation of linked copy These lines were not used now because the handling of copy data has changed. Assigning the `eval` data can produce unexpected result, especially since everywhere ID_RECALC_TRANSFORM is used, we also do a copy on write. That should take care of `ob->data` for the eval object. --- source/blender/blenkernel/intern/object_update.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index f41d59c77ba..8ff02c7e698 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -130,11 +130,6 @@ void BKE_object_eval_transform_final(Depsgraph *depsgraph, Object *ob) else { ob->transflag &= ~OB_NEG_SCALE; } - - /* Assign evaluated version. */ - if ((ob->type == OB_GPENCIL) && (ob->runtime.gpd_eval != NULL)) { - ob->data = ob->runtime.gpd_eval; - } } void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *ob) -- cgit v1.2.3