diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-02-09 05:27:26 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-02-09 05:27:41 +0300 |
| commit | 69327137c02ae2ccbfa5a49ec736cf0dff1904cd (patch) | |
| tree | a278eb3ff1c594aca6dc6556d29f0d3f9a56efbf /source/blender/editors/transform/transform_manipulator.c | |
| parent | 97d9d6224c5e3be3e3ddff012558ed9e03cf0e32 (diff) | |
Fix T47367: Segfault in BIF_draw_manipulator() with "around active" and the active object hidden
Accidentally left off null check when cleaning up the code there in
34993bf97dcbfd29289d14228ac10f1cfa206a15 (GPencil_Editing_Stage3 branch)
Thanks to Sami Pelkonen (pltsi) who reported this bug, along with
some nice and detailed backtraces which made it easy to locate
the problem :)
Diffstat (limited to 'source/blender/editors/transform/transform_manipulator.c')
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 0f2af58e0ce..7e4e6bc0f70 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1633,7 +1633,7 @@ void BIF_draw_manipulator(const bContext *C) if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) && ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) && - (!(ob->mode & OB_MODE_POSE))) + (ob && !(ob->mode & OB_MODE_POSE))) { copy_v3_v3(rv3d->twmat[3], ob->obmat[3]); } |