diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 02:14:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 02:19:00 +0300 |
| commit | 6112cde3f90e4e0f2ba5fc37150efcd239b97250 (patch) | |
| tree | c933cac2e4c385a6ec6a5045cd479d25f2a8c998 /source/blender/render | |
| parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
| parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index e6138842f09..4241dff96de 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3754,7 +3754,7 @@ Material *RE_sample_material_init(Material *orig_mat, Scene *scene) if (!orig_mat) return NULL; /* copy material */ - mat = localize_material(orig_mat); + mat = BKE_material_localize(orig_mat); /* update material anims */ BKE_animsys_evaluate_animdata(scene, &mat->id, mat->adt, BKE_scene_frame_get(scene), ADT_RECALC_ANIM); |