blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Missed in last merge

This commit is contained in:
Campbell Barton 2018-04-03 18:22:05 +02:00
parent e52beb3733
commit 48eaddfae0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_280.c
View File

@ -505,7 +505,7 @@ void do_versions_after_linking_280(Main *main)
soutliner->outlinevis = SO_VIEW_LAYER;
if (BLI_listbase_count_ex(&layer->layer_collections, 2) == 1) {
if (BLI_listbase_count_at_most(&layer->layer_collections, 2) == 1) {
if (soutliner->treestore == NULL) {
soutliner->treestore = BLI_mempool_create(
sizeof(TreeStoreElem), 1, 512, BLI_MEMPOOL_ALLOW_ITER);

2
source/blender/editors/mesh/editmesh_select.c
View File

@ -2006,7 +2006,7 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
const int cd_fmap_offset = CustomData_get_offset(&vc.em->bm->pdata, CD_FACEMAP);
if (cd_fmap_offset != -1) {
int map = *((int *)BM_ELEM_CD_GET_VOID_P(efa, cd_fmap_offset));
if ((map < -1) || (map > BLI_listbase_count_ex(&vc.obedit->fmaps, map))) {
if ((map < -1) || (map > BLI_listbase_count_at_most(&vc.obedit->fmaps, map))) {
map = -1;
}
map += 1;

2
source/blender/windowmanager/intern/wm_window.c
View File

@ -1015,7 +1015,7 @@ int wm_window_new_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(even
WorkSpace *workspace = WM_window_get_active_workspace(win);
ListBase *listbase = BKE_workspace_layouts_get(workspace);
if (BLI_listbase_count_ex(listbase, 2) == 1) {
if (BLI_listbase_count_at_most(listbase, 2) == 1) {
RNA_enum_set(op->ptr, "screen", 0);
return wm_window_new_exec(C, op);
}