Commit: 39f22cc8570223e7256763576eab9f1c6309f115
Author: Yiming Wu
Date: Fri Dec 14 14:47:39 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB39f22cc8570223e7256763576eab9f1c6309f115
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/makesrna/intern/rna_scene.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_scene.c
index 32b67eeb712,4d499b93ab2..b332655a3fc
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -460,12 -458,12 +460,12 @@@ static const EnumPropertyItem rna_enum_
const EnumPropertyItem rna_enum_transform_pivot_items_full[] = {
{V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_PIVOT_BOUNDBOX,
"Bounding Box Center",
- "Pivot around bounding box center of selected object(s)"},
+ "Pivot around bounding box center of selected object(s)"},
{V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Pivot
around the 3D cursor"},
{V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL,
- "Individual Origins", "Pivot around each object's own origin"},
- {V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median
Point",
- "Pivot around the median point of selected objects"},
+ "Individual Origins", "Pivot around each object's own
origin"},
+ {V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median
Point",
+ "Pivot around the median point of selected objects"},
{V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", ICON_PIVOT_ACTIVE, "Active
Element", "Pivot around active object"},
{0, NULL, 0, NULL, NULL}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
