Merge remote-tracking branch 'origin/blender-v3.2-release'
This commit is contained in:
@@ -48,7 +48,7 @@ ccl_device float3 integrator_eval_background_shader(KernelGlobals kg,
|
||||
|
||||
PROFILING_SHADER(emission_sd->object, emission_sd->shader);
|
||||
PROFILING_EVENT(PROFILING_SHADE_LIGHT_EVAL);
|
||||
shader_eval_surface<KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT>(
|
||||
shader_eval_surface<KERNEL_FEATURE_NODE_MASK_SURFACE_BACKGROUND>(
|
||||
kg, state, emission_sd, render_buffer, path_flag | PATH_RAY_EMISSION);
|
||||
|
||||
L = shader_background_eval(emission_sd);
|
||||
|
@@ -1700,6 +1700,8 @@ enum KernelFeatureFlag : uint32_t {
|
||||
#define KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT \
|
||||
(KERNEL_FEATURE_NODE_EMISSION | KERNEL_FEATURE_NODE_VORONOI_EXTRA | \
|
||||
KERNEL_FEATURE_NODE_LIGHT_PATH)
|
||||
#define KERNEL_FEATURE_NODE_MASK_SURFACE_BACKGROUND \
|
||||
(KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT | KERNEL_FEATURE_NODE_AOV)
|
||||
#define KERNEL_FEATURE_NODE_MASK_SURFACE_SHADOW \
|
||||
(KERNEL_FEATURE_NODE_BSDF | KERNEL_FEATURE_NODE_EMISSION | KERNEL_FEATURE_NODE_VOLUME | \
|
||||
KERNEL_FEATURE_NODE_BUMP | KERNEL_FEATURE_NODE_BUMP_STATE | \
|
||||
|
@@ -302,6 +302,7 @@ static float get_default_column_width(const ColumnValues &values)
|
||||
switch (values.type()) {
|
||||
case SPREADSHEET_VALUE_TYPE_BOOL:
|
||||
return 2.0f;
|
||||
case SPREADSHEET_VALUE_TYPE_INT8:
|
||||
case SPREADSHEET_VALUE_TYPE_INT32:
|
||||
return float_width;
|
||||
case SPREADSHEET_VALUE_TYPE_FLOAT:
|
||||
|
@@ -23,6 +23,9 @@ eSpreadsheetColumnValueType cpp_type_to_column_type(const CPPType &type)
|
||||
if (type.is<bool>()) {
|
||||
return SPREADSHEET_VALUE_TYPE_BOOL;
|
||||
}
|
||||
if (type.is<int8_t>()) {
|
||||
return SPREADSHEET_VALUE_TYPE_INT8;
|
||||
}
|
||||
if (type.is<int>()) {
|
||||
return SPREADSHEET_VALUE_TYPE_INT32;
|
||||
}
|
||||
|
@@ -71,6 +71,35 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (column_data.type().is<int8_t>()) {
|
||||
const int value = row_filter.value_int;
|
||||
switch (row_filter.operation) {
|
||||
case SPREADSHEET_ROW_FILTER_EQUAL: {
|
||||
apply_filter_operation(
|
||||
column_data.typed<int8_t>(),
|
||||
[&](const int cell) { return cell == value; },
|
||||
prev_mask,
|
||||
new_indices);
|
||||
break;
|
||||
}
|
||||
case SPREADSHEET_ROW_FILTER_GREATER: {
|
||||
apply_filter_operation(
|
||||
column_data.typed<int8_t>(),
|
||||
[value](const int cell) { return cell > value; },
|
||||
prev_mask,
|
||||
new_indices);
|
||||
break;
|
||||
}
|
||||
case SPREADSHEET_ROW_FILTER_LESS: {
|
||||
apply_filter_operation(
|
||||
column_data.typed<int8_t>(),
|
||||
[&](const int cell) { return cell < value; },
|
||||
prev_mask,
|
||||
new_indices);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (column_data.type().is<int>()) {
|
||||
const int value = row_filter.value_int;
|
||||
switch (row_filter.operation) {
|
||||
|
@@ -63,6 +63,7 @@ static std::string value_string(const SpreadsheetRowFilter &row_filter,
|
||||
const eSpreadsheetColumnValueType data_type)
|
||||
{
|
||||
switch (data_type) {
|
||||
case SPREADSHEET_VALUE_TYPE_INT8:
|
||||
case SPREADSHEET_VALUE_TYPE_INT32:
|
||||
return std::to_string(row_filter.value_int);
|
||||
case SPREADSHEET_VALUE_TYPE_FLOAT: {
|
||||
@@ -200,6 +201,10 @@ static void spreadsheet_filter_panel_draw(const bContext *C, Panel *panel)
|
||||
}
|
||||
|
||||
switch (static_cast<eSpreadsheetColumnValueType>(column->data_type)) {
|
||||
case SPREADSHEET_VALUE_TYPE_INT8:
|
||||
uiItemR(layout, filter_ptr, "operation", 0, nullptr, ICON_NONE);
|
||||
uiItemR(layout, filter_ptr, "value_int8", 0, IFACE_("Value"), ICON_NONE);
|
||||
break;
|
||||
case SPREADSHEET_VALUE_TYPE_INT32:
|
||||
uiItemR(layout, filter_ptr, "operation", 0, nullptr, ICON_NONE);
|
||||
uiItemR(layout, filter_ptr, "value_int", 0, IFACE_("Value"), ICON_NONE);
|
||||
|
@@ -2014,6 +2014,7 @@ typedef enum eSpreadsheetColumnValueType {
|
||||
SPREADSHEET_VALUE_TYPE_INSTANCES = 6,
|
||||
SPREADSHEET_VALUE_TYPE_STRING = 7,
|
||||
SPREADSHEET_VALUE_TYPE_BYTE_COLOR = 8,
|
||||
SPREADSHEET_VALUE_TYPE_INT8 = 9,
|
||||
} eSpreadsheetColumnValueType;
|
||||
|
||||
/**
|
||||
|
@@ -7818,6 +7818,12 @@ static void rna_def_spreadsheet_row_filter(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Integer Value", "");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SPREADSHEET, NULL);
|
||||
|
||||
prop = RNA_def_property(srna, "value_int8", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_int_sdna(prop, NULL, "value_int");
|
||||
RNA_def_property_range(prop, -128, 127);
|
||||
RNA_def_property_ui_text(prop, "8-Bit Integer Value", "");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SPREADSHEET, NULL);
|
||||
|
||||
prop = RNA_def_property(srna, "value_boolean", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPREADSHEET_ROW_FILTER_BOOL_VALUE);
|
||||
RNA_def_property_ui_text(prop, "Boolean Value", "");
|
||||
|
Reference in New Issue
Block a user