griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.82-release'

Browse Source
This commit is contained in:
Campbell Barton
2020-01-15 13:46:25 +11:00
parent 1ec08999b6 dedceb9395
commit 41075589c0
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/bvh/bvh_embree.cpp
View File

@@ -190,10 +190,10 @@ static void rtc_filter_occluded_func(const RTCFilterFunctionNArguments *args)
}
else {
ctx->ss_isect->num_hits = 1;
}
/* record intersection */
kernel_embree_convert_local_hit(
kg, ray, hit, &ctx->ss_isect->hits[hit_idx], ctx->sss_object_id);
}
/* record intersection */
kernel_embree_convert_local_hit(
kg, ray, hit, &ctx->ss_isect->hits[hit_idx], ctx->sss_object_id);
ctx->ss_isect->Ng[hit_idx].x = hit->Ng_x;
ctx->ss_isect->Ng[hit_idx].y = hit->Ng_y;
ctx->ss_isect->Ng[hit_idx].z = hit->Ng_z;

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

@@ -1314,7 +1314,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
break;
case DRW_CMD_DRAW:
if (!USE_BATCHING || state.obmats_loc == -1 || (G.f & G_FLAG_PICKSEL) ||
cmd->draw.batch->inst) {
cmd->draw.batch->inst[0]) {
draw_call_single_do(shgroup, &state, cmd->draw.batch, cmd->draw.handle, 0, 0, 0, true);
}
else {

6
source/blender/editors/mesh/editmesh_bevel.c
View File

@@ -425,7 +425,13 @@ static void edbm_bevel_exit(bContext *C, wmOperator *op)
View3D *v3d = CTX_wm_view3d(C);
ARegion *ar = CTX_wm_region(C);
for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) {
Object *obedit = opdata->ob_store[ob_index].ob;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
EDBM_redo_state_free(&opdata->ob_store[ob_index].mesh_backup, NULL, false);
/* Without this, faces surrounded by selected edges/verts will be unselected. */
if ((em->selectmode & SCE_SELECT_FACE) == 0) {
EDBM_selectmode_flush(em);
}
}
ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel);
if (v3d) {

5
source/blender/makesrna/intern/rna_wm.c
View File

@@ -302,6 +302,11 @@ const EnumPropertyItem rna_enum_event_type_items[] = {
{F17KEY, "F17", 0, "F17", ""},
{F18KEY, "F18", 0, "F18", ""},
{F19KEY, "F19", 0, "F19", ""},
{F20KEY, "F20", 0, "F20", ""},
{F21KEY, "F21", 0, "F21", ""},
{F22KEY, "F22", 0, "F22", ""},
{F23KEY, "F23", 0, "F23", ""},
{F24KEY, "F24", 0, "F24", ""},
{PAUSEKEY, "PAUSE", 0, "Pause", ""},
{INSERTKEY, "INSERT", 0, "Insert", "Ins"},
{HOMEKEY, "HOME", 0, "Home", ""},

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

@@ -3883,7 +3883,7 @@ static int convert_key(GHOST_TKey key)
else if (key >= GHOST_kKeyNumpad0 && key <= GHOST_kKeyNumpad9) {
return (PAD0 + ((int)key - GHOST_kKeyNumpad0));
}
else if (key >= GHOST_kKeyF1 && key <= GHOST_kKeyF19) {
else if (key >= GHOST_kKeyF1 && key <= GHOST_kKeyF24) {
return (F1KEY + ((int)key - GHOST_kKeyF1));
}
else {

7
source/blender/windowmanager/wm_event_types.h
View File

@@ -223,6 +223,11 @@ enum {
F17KEY = 0x013c, /* 316 */
F18KEY = 0x013d, /* 317 */
F19KEY = 0x013e, /* 318 */
F20KEY = 0x013f, /* 319 */
F21KEY = 0x0140, /* 320 */
F22KEY = 0x0141, /* 321 */
F23KEY = 0x0142, /* 322 */
F24KEY = 0x0143, /* 323 */
/* *** End of keyboard codes. *** */
@@ -347,7 +352,7 @@ enum {
/* test whether the event is a key on the keyboard */
#define ISKEYBOARD(event_type) \
(((event_type) >= 0x0020 && (event_type) <= 0x00ff) || \
((event_type) >= 0x012c && (event_type) <= 0x013f))
((event_type) >= 0x012c && (event_type) <= 0x0143))
/* test whether the event is a modifier key */
#define ISKEYMODIFIER(event_type) \