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

Merge remote-tracking branch 'origin/blender-v3.2-release'

This commit is contained in:
Dalai Felinto 2022-05-30 16:44:22 +02:00
parent cd6551d4eb 6856290514
commit c1277c5d25
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/opensubdiv/stub/opensubdiv_evaluator_stub.cc
View File

@ -23,8 +23,7 @@
OpenSubdiv_Evaluator *openSubdiv_createEvaluatorFromTopologyRefiner(
struct OpenSubdiv_TopologyRefiner * /*topology_refiner*/,
eOpenSubdivEvaluator /*evaluator_type*/,
OpenSubdiv_EvaluatorCache * /*evaluator_cache*/
)
OpenSubdiv_EvaluatorCache * /*evaluator_cache*/)
{
return NULL;
}

5
source/blender/blenkernel/intern/object_update.c
View File

@ -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)

48
source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
View File

@ -190,33 +190,29 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
}
else if (column_data.type().is<InstanceReference>()) {
const StringRef value = row_filter.value_string;
switch (row_filter.operation) {
case SPREADSHEET_ROW_FILTER_EQUAL: {
apply_filter_operation(
column_data.typed<InstanceReference>(),
[&](const InstanceReference cell) {
switch (cell.type()) {
case InstanceReference::Type::Object: {
return value == (reinterpret_cast<ID &>(cell.object()).name + 2);
}
case InstanceReference::Type::Collection: {
return value == (reinterpret_cast<ID &>(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<InstanceReference>(),
[&](const InstanceReference cell) {
switch (cell.type()) {
case InstanceReference::Type::Object: {
return value == (reinterpret_cast<ID &>(cell.object()).name + 2);
}
case InstanceReference::Type::Collection: {
return value == (reinterpret_cast<ID &>(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);
}
}