Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-14 03:09:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-14 03:09:42 +0300
commitdd4c87cd0451376bce96c459d90c2b95409f0d11 (patch)
tree576ee74ff71032c2b6eec94e549a1dba90edec96 /source/blender/editors/armature
parentaca13040dac986e34468e7d533d0c3cc970fda90 (diff)
parentaa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r--source/blender/editors/armature/armature_edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index e44c1b02f22..7aa6b578475 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -160,7 +160,7 @@ void ED_armature_origin_set(Main *bmain, Object *ob, float cursor[3], int center
mul_m4_v3(ob->imat, cent);
}
else {
- if (around == V3D_AROUND_CENTER_MEAN) {
+ if (around == V3D_AROUND_CENTER_MEDIAN) {
int total = 0;
zero_v3(cent);
for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {