diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:52:52 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:52:52 +0300 |
| commit | 833268e2b8ef9c944f913b4f5ba0b4084423d6f2 (patch) | |
| tree | 3feb9dc06571d195e662027065089b96f37e07d7 | |
| parent | 50fde02b422a1a1dbc71a7bc95a061e46ce73b33 (diff) | |
Compile fix for changes from master
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index d6eae1502a0..5068eda8380 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -1117,7 +1117,7 @@ static int gp_snap_cursor_to_sel(bContext *C, wmOperator *op) } CTX_DATA_END; - if (v3d->around == V3D_CENTROID) { + if (v3d->around == V3D_AROUND_CENTER_MEAN) { mul_v3_fl(centroid, 1.0f / (float)count); copy_v3_v3(cursor, centroid); } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 0c3f74dbe9d..74d27fb3068 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1623,6 +1623,9 @@ void BIF_draw_manipulator(const bContext *C) case V3D_AROUND_CENTER_BOUNDS: case V3D_AROUND_ACTIVE: { + bGPdata *gpd = CTX_data_gpencil_data(C); + Object *ob = OBACT; + if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) && ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) && (!(ob->mode & OB_MODE_POSE))) |