diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 13:32:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 13:32:20 +0300 |
| commit | f30086b5b66b1f8f797a61d3506f97eda557d76a (patch) | |
| tree | 1a0a3eb3213bb627b72816fea91bc1b3ff082a98 /source/blender/editors/space_buttons | |
| parent | f2b4a59be61e555a3813f1a31799f09affc5237e (diff) | |
| parent | ee49ee24c33b3bf905603322d35a60d59331a7f7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 1d67ac620b0..e3d72ba67d8 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -350,7 +350,7 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext * if (!scene) scene = CTX_data_scene(C); - if (!(pinid || pinid == &scene->id)) { + if (!pinid || GS(pinid->name) == ID_SCE) { ob = (scene->basact) ? scene->basact->object : NULL; wrld = scene->world; brush = BKE_paint_brush(BKE_paint_get_active_from_context(C)); |