diff options
author | Hans Goudey <h.goudey@me.com> | 2022-01-28 19:06:04 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-01-28 19:06:04 +0300 |
commit | dd4a89e78dfd4c43f5a5183c1c3e6156e5e504e8 (patch) | |
tree | f0382632bece4b83f053e25cde164c5831bf9f9a /source/blender | |
parent | 92d747b0c46e2645b7308edd31c778634c68c2c5 (diff) | |
parent | cb09485ff2bd7a4931bff0d4bf951b663aafd000 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
4 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index 56ecd108bba..17229c4898e 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/source/blender/editors/geometry/geometry_attributes.cc @@ -325,6 +325,8 @@ static int geometry_attribute_convert_exec(bContext *C, wmOperator *op) static void geometry_attribute_convert_ui(bContext *UNUSED(C), wmOperator *op) { uiLayout *layout = op->layout; + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, op->ptr, "mode", 0, nullptr, ICON_NONE); diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index 40e54ab4394..716d6e33a81 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc @@ -39,6 +39,8 @@ #include "DNA_userdef_types.h" +#include "NOD_shader.h" + #include "DRW_engine.h" #include "bmesh.h" @@ -167,7 +169,7 @@ void BKE_mesh_looptri_get_real_edges(const struct Mesh *UNUSED(mesh), /** \name Stubs of BKE_material.h * \{ */ -void BKE_material_defaults_free_gpu(void) +void BKE_material_defaults_free_gpu() { /* This function is reachable via GPU_exit. */ } diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 3965d796647..5e03f7d0767 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -119,7 +119,7 @@ struct GPUSource { template<bool check_whole_word = true, bool reversed = false, typename T> int64_t find_str(const StringRef &input, const T keyword, int64_t offset = 0) { - while (1) { + while (true) { if constexpr (reversed) { offset = input.rfind(keyword, offset); } @@ -202,10 +202,10 @@ struct GPUSource { * - All values needs to be specified using constant literals to avoid compiler differences. * - All values needs to have the 'u' suffix to avoid GLSL compiler errors. */ - void enum_preprocess(void) + void enum_preprocess() { const StringRefNull input = source; - std::string output = ""; + std::string output; int64_t cursor = 0; int64_t last_pos = 0; const bool is_cpp = filename.endswith(".hh"); @@ -220,7 +220,7 @@ struct GPUSource { continue; \ } - while (1) { + while (true) { cursor = find_keyword(input, "enum ", cursor); if (cursor == -1) { break; diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index d1ef6448791..6f39d69e6ff 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -498,7 +498,7 @@ std::string GLShader::geometry_layout_declare(const ShaderCreateInfo &info) cons static StageInterfaceInfo *find_interface_by_name(const Vector<StageInterfaceInfo *> &ifaces, const StringRefNull &name) { - for (auto iface : ifaces) { + for (auto *iface : ifaces) { if (iface->name == name) { return iface; } |