diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-31 16:51:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-31 16:52:11 +0300 |
| commit | f32a18994ad7f37eb568771f01bab9db53d38d54 (patch) | |
| tree | dc014ea9a34c0d1fc414f1afa937daf1f55a5f97 /source/blender/modifiers | |
| parent | 82276d6cf7d3e18a0e5654d472bdff2b716b0d54 (diff) | |
| parent | a481908232ef20449e6ad6951769677e0b108ca8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index f2f2a8a5a49..c422aa05b12 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -358,6 +358,7 @@ static void displaceModifier_do( data.vert_clnors = vert_clnors; if (dmd->texture != NULL) { data.pool = BKE_image_pool_new(); + BKE_texture_fetch_images_for_pool(dmd->texture, data.pool); } BLI_task_parallel_range(0, numVerts, &data, displaceModifier_do_task, numVerts > 512); |