diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-03-25 05:00:16 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-03-25 05:00:16 +0400 |
commit | ceb3225db77c5a86b8cb8cce555251c1dffdd033 (patch) | |
tree | 8f709801c59f683c2cb50ea67841c5f15861b075 /source/blender/blenkernel/intern/texture.c | |
parent | 48a256c910e85405747ad47a62bcb70159aee638 (diff) |
Alpha mask textures porting part 1: Support for projective texturing.
Also add random mapping to brushes.
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 2517324242b..10b0e14d517 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -804,6 +804,10 @@ void BKE_texture_make_local(Tex *tex) if (br->id.lib) is_lib = TRUE; else is_local = TRUE; } + if (br->mask_mtex.tex == tex) { + if (br->id.lib) is_lib = TRUE; + else is_local = TRUE; + } br = br->id.next; } pa = bmain->particle.first; @@ -877,6 +881,13 @@ void BKE_texture_make_local(Tex *tex) tex->id.us--; } } + if (br->mask_mtex.tex == tex) { + if (br->id.lib == NULL) { + br->mask_mtex.tex = tex_new; + tex_new->id.us++; + tex->id.us--; + } + } br = br->id.next; } pa = bmain->particle.first; |