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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-09 13:17:35 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-09 13:19:52 +0300
commit92b342d30d33a3da0816d2c2715adc959360e095 (patch)
tree302dffd290cc56a44111dfb5765b1f90b68165a3 /source/blender/editors/space_buttons
parent8d7ec519dff93b04fdec548aeef4b90137d788c8 (diff)
Fix logic for pinning textures users from context
This was wrong since it's concenption in 28ee0f9218. The if statement was returning true when pinid was NULL, and false otherwise. However when scene is pinned we also want to run this code. Code snippet by Brecht Van Lommel.
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r--source/blender/editors/space_buttons/buttons_texture.c2
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));