blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'blender-v2.81-release'

This commit is contained in:
Campbell Barton 2019-10-25 06:11:47 +11:00
parent e50b4d7de4 892c3891ed
commit 2a3b5dc730
Notes: blender-bot 2023-02-14 06:25:25 +01:00 
Referenced by issue #71125, Blender 2.82 - Collection instance outlines are drawn whilst cycles is viewport rendering
Referenced by issue #71126, Blender 2.82 - No hotkey to set start and end frames in the timeline
Referenced by issue #71127, Blender 2.82 - Default key map - No Set Origin hotkey
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform_gizmo_extrude_3d.c
View File

@ -470,7 +470,7 @@ void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt)
gzgt->message_subscribe = gizmo_mesh_extrude_message_subscribe;
static const EnumPropertyItem axis_type_items[] = {
{EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Regular", "Only show normal axis"},
{EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Normal", "Only show normal axis"},
{EXTRUDE_AXIS_XYZ, "XYZ", 0, "XYZ", "Follow scene orientation"},
{0, NULL, 0, NULL, NULL},
};

2
source/blender/makesrna/intern/rna_mesh.c
View File

@ -47,7 +47,7 @@
#include "WM_types.h"
const EnumPropertyItem rna_enum_mesh_delimit_mode_items[] = {
{BMO_DELIM_NORMAL, "NORMAL", 0, "Regular", "Delimit by face directions"},
{BMO_DELIM_NORMAL, "NORMAL", 0, "Normal", "Delimit by face directions"},
{BMO_DELIM_MATERIAL, "MATERIAL", 0, "Material", "Delimit by face material"},
{BMO_DELIM_SEAM, "SEAM", 0, "Seam", "Delimit by edge seams"},
{BMO_DELIM_SHARP, "SHARP", 0, "Sharp", "Delimit by sharp edges"},