diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-02-13 14:45:04 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-13 14:45:04 +0300 |
| commit | fed5393043cd8c0c9282cc3bd8e0c8db2aa3ea24 (patch) | |
| tree | f76181acedb596ae09d0f875a7a190b7a6d28ccd /source/blender/blenkernel/intern/texture.c | |
| parent | cc41de09a0a29c65c4db3e75766d58bb1551ed7c (diff) | |
Fix for [#26053] Blender Crash with Particules Textures
* Particle textures weren't handled properly on texture slot move operations.
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 6bd64e1e2f5..cf4fcbb4def 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1051,6 +1051,10 @@ int give_active_mtex(ID *id, MTex ***mtex_ar, short *act) *mtex_ar= ((Lamp *)id)->mtex; if(act) *act= (((Lamp *)id)->texact); break; + case ID_PA: + *mtex_ar= ((ParticleSettings *)id)->mtex; + if(act) *act= (((ParticleSettings *)id)->texact); + break; default: *mtex_ar = NULL; if(act) *act= 0; |