Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +6 -6
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be92bfd6fa - Show all commits

2
source/blender/compositor/realtime_compositor/intern/evaluator.cc
View File

@ -161,7 +161,7 @@ void Evaluator::compile_and_evaluate_shader_compile_unit(CompileState &compile_s
void Evaluator::map_shader_operation_inputs_to_their_results(ShaderOperation *operation, void Evaluator::map_shader_operation_inputs_to_their_results(ShaderOperation *operation,
CompileState &compile_state) CompileState &compile_state)
{ {
for (const auto &item : operation->get_inputs_to_linked_outputs_map().items()) { for (const auto item : operation->get_inputs_to_linked_outputs_map().items()) {
Result &result = compile_state.get_result_from_output_socket(item.value); Result &result = compile_state.get_result_from_output_socket(item.value);
operation->map_input_to_result(item.key, &result); operation->map_input_to_result(item.key, &result);
} }

2
source/blender/compositor/realtime_compositor/intern/shader_operation.cc
View File

@ -81,7 +81,7 @@ Map<std::string, DOutputSocket> &ShaderOperation::get_inputs_to_linked_outputs_m
void ShaderOperation::compute_results_reference_counts(const Schedule &schedule) void ShaderOperation::compute_results_reference_counts(const Schedule &schedule)
{ {
for (const auto &item : output_sockets_to_output_identifiers_map_.items()) { for (const auto item : output_sockets_to_output_identifiers_map_.items()) {
const int reference_count = number_of_inputs_linked_to_output_conditioned( const int reference_count = number_of_inputs_linked_to_output_conditioned(
item.key, [&](DInputSocket input) { return schedule.contains(input.node()); }); item.key, [&](DInputSocket input) { return schedule.contains(input.node()); });

2
source/blender/draw/intern/draw_manager_shader.c
View File

@ -118,7 +118,7 @@ static void drw_deferred_shader_compilation_exec(
BLI_spin_lock(&comp->list_lock); BLI_spin_lock(&comp->list_lock);
/* Pop tail because it will be less likely to lock the main thread /* Pop tail because it will be less likely to lock the main thread
* if all GPUMaterials are to be freed (see DRW_deferred_shader_remove()). */ * if all GPUMaterials are to be freed (see DRW_deferred_shader_remove()). */
LinkData *link = (LinkData *)BLI_poptail(&comp->optimize_queue); link = (LinkData *)BLI_poptail(&comp->optimize_queue);
GPUMaterial *optimize_mat = link ? (GPUMaterial *)link->data : NULL; GPUMaterial *optimize_mat = link ? (GPUMaterial *)link->data : NULL;
if (optimize_mat) { if (optimize_mat) {
/* Avoid another thread freeing the material during optimization. */ /* Avoid another thread freeing the material during optimization. */

2
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -2715,7 +2715,7 @@ void SCULPT_brush_strength_color(SculptSession *ss,
void SCULPT_calc_vertex_displacement(SculptSession *ss, void SCULPT_calc_vertex_displacement(SculptSession *ss,
const Brush *brush, const Brush *brush,
float rgba[4], float rgba[3],
float out_offset[3]) float out_offset[3])
{ {
mul_v3_fl(rgba, ss->cache->bstrength); mul_v3_fl(rgba, ss->cache->bstrength);

2
source/blender/gpu/opengl/gl_shader.hh
View File

@ -47,7 +47,7 @@ class GLShader : public Shader {
void fragment_shader_from_glsl(MutableSpan<const char *> sources) override; void fragment_shader_from_glsl(MutableSpan<const char *> sources) override;
void compute_shader_from_glsl(MutableSpan<const char *> sources) override; void compute_shader_from_glsl(MutableSpan<const char *> sources) override;
bool finalize(const shader::ShaderCreateInfo *info = nullptr) override; bool finalize(const shader::ShaderCreateInfo *info = nullptr) override;
void warm_cache(int limit) override{}; void warm_cache(int /*limit*/) override{};
std::string resources_declare(const shader::ShaderCreateInfo &info) const override; std::string resources_declare(const shader::ShaderCreateInfo &info) const override;
std::string vertex_interface_declare(const shader::ShaderCreateInfo &info) const override; std::string vertex_interface_declare(const shader::ShaderCreateInfo &info) const override;

2
source/blender/nodes/intern/geometry_nodes_log.cc
View File

@ -330,7 +330,7 @@ void GeoTreeLog::ensure_used_named_attributes()
GeoTreeLog &child_log = modifier_log_->get_tree_log(child_hash); GeoTreeLog &child_log = modifier_log_->get_tree_log(child_hash);
child_log.ensure_used_named_attributes(); child_log.ensure_used_named_attributes();
if (const std::optional<int32_t> &group_node_id = child_log.tree_loggers_[0]->group_node_id) { if (const std::optional<int32_t> &group_node_id = child_log.tree_loggers_[0]->group_node_id) {
for (const auto &item : child_log.used_named_attributes.items()) { for (const auto item : child_log.used_named_attributes.items()) {
add_attribute(*group_node_id, item.key, item.value); add_attribute(*group_node_id, item.key, item.value);
} }
} }