blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Nathan Craddock 2020-11-18 08:19:37 -07:00
parent 898231fdbc 9a8f5022b7
commit 56ef6fdb9e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -3278,6 +3278,7 @@ static void outliner_draw_hierarchy_lines(SpaceOutliner *space_outliner,
UI_GetThemeColorBlend3ubv(TH_BACK, TH_TEXT, 0.4f, col);
col[3] = 255;
GPU_line_width(1.0f);
GPU_blend(GPU_BLEND_ALPHA);
outliner_draw_hierarchy_lines_recursive(pos, space_outliner, lb, startx, col, false, starty);
GPU_blend(GPU_BLEND_NONE);

5
source/blender/modifiers/intern/MOD_boolean.c
View File

@ -340,13 +340,16 @@ static void BMD_mesh_intersection(BMesh *bm,
* other than 0, -1, or 1 in the scaling part of the matrix.
*/
float cleaned_object_obmat[4][4];
float cleaned_operand_obmat[4][4];
clean_obmat(cleaned_object_obmat, object->obmat);
invert_m4_m4(imat, cleaned_object_obmat);
clean_obmat(cleaned_operand_obmat, operand_ob->obmat);
mul_m4_m4m4(omat, imat, cleaned_operand_obmat);
}
else {
invert_m4_m4(imat, object->obmat);
mul_m4_m4m4(omat, imat, operand_ob->obmat);
}
mul_m4_m4m4(omat, imat, operand_ob->obmat);
BMVert *eve;
i = 0;