Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2022-05-12 16:53:12 +0300
committerJulian Eisel <julian@blender.org>2022-05-12 17:56:14 +0300
commit3693e1d8e80501c6efcb8f732107742f80acf773 (patch)
tree2fc6177061859beff71ffd3413fad4131724be82 /source/blender/editors/interface/interface_utils.cc
parentc31f519954f2b21fecc86b1b3b9386685226dbdc (diff)
Revert commits to increase button flag bitfield size
This reverts the commits 8d9d5da13706b668b9bd0d631e00c9b00b73f3ea, 59cd616534b46ab85b4324a0886bd9eb8876a48b and 98a04ed4524234b1840dc039c2f356db5ac57f26. The commits are causing issues with MSVC, see D14926. I'm working on a different solution, but that will need some work.
Diffstat (limited to 'source/blender/editors/interface/interface_utils.cc')
-rw-r--r--source/blender/editors/interface/interface_utils.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc
index e68d8f12a1f..993ccdf92f7 100644
--- a/source/blender/editors/interface/interface_utils.cc
+++ b/source/blender/editors/interface/interface_utils.cc
@@ -494,7 +494,7 @@ static bool add_collection_search_item(CollItemSearch *cis,
cis->name,
cis->data,
cis->iconid,
- cis->has_sep_char ? (uint64_t)UI_BUT_HAS_SEP_CHAR : 0,
+ cis->has_sep_char ? (int)UI_BUT_HAS_SEP_CHAR : 0,
name_prefix_offset);
}