diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-05-10 01:37:36 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-05-10 01:37:36 +0400 |
| commit | 6c7747a6f10b4d445df1920e9450d5ef6ca5101d (patch) | |
| tree | 73b790d6a9be5e74953c751e93776ed8b79784c5 /source/blender/src/butspace.c | |
| parent | 366f58fca782149492f798dcfc11d44b8bdab713 (diff) | |
Bug #1264
When in texture buttons, selecting Lamp, Camera or other Object didnt
update the shown texture correctly. Now it nicely switches.
Diffstat (limited to 'source/blender/src/butspace.c')
| -rw-r--r-- | source/blender/src/butspace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index 9edf5c60abe..b2e0c95e9e9 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -336,6 +336,9 @@ void butspace_context_switch(SpaceButs *buts, Base *new) } else if(tab == TAB_SHADING_TEX) { + if(new->object->type==OB_LAMP) buts->texfrom= 2; + else if(new->object->type==OB_CAMERA) buts->texfrom= 1; + else buts->texfrom= 0; } else if(tab == TAB_SHADING_RAD) { } |