diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
commit | ebf1c5faca86286aa90ab5ab9fc4d3ddb1f51cdf (patch) | |
tree | 1e457366adcd664233760e5e17b20aa6c3f8e4a2 /source/blender/editors/screen | |
parent | db1cab0f3a75562eebf5aea93753e77582a4c3e4 (diff) |
2.5/Texture paint
* Made texture paint object-localized too.
Note for Brecht: gpu_draw.c had three uses of G_TEXTUREPAINT that I was not able to cleanly fix, so commented out for now. Can you take a look and see what should be done here?
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 31e301f06bc..1d6235eec18 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -129,13 +129,13 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } else if(CTX_data_equals(member, "weight_paint_object")) { if(ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) - CTX_data_id_pointer_set(result, &scene->basact->object->id); + CTX_data_id_pointer_set(result, &ob->id); return 1; } else if(CTX_data_equals(member, "texture_paint_object")) { - if(G.f & G_TEXTUREPAINT && scene->basact) - CTX_data_id_pointer_set(result, &scene->basact->object->id); + if(ob && (ob->mode & OB_MODE_TEXTURE_PAINT)) + CTX_data_id_pointer_set(result, &ob->id); return 1; } |