Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
dd4a89e78d
|
@ -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);
|
||||
|
||||
|
|
|
@ -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. */
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue