diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
| commit | b46b2834b9596b9a7c026dd2e041a329cda9bb59 (patch) | |
| tree | 2b1c36f3ab62159a511b67dacc422542d0f91b87 /source/blender/modifiers/intern/MOD_displace.c | |
| parent | 53a9dec2bfecc8a2c863d850bcec05aafb008bac (diff) | |
| parent | 9dd194716b0f43fa02ae6cd32ada556d8d622390 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 43e7ac238d1..4f875bbf35f 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -300,7 +300,7 @@ static void displaceModifier_do( float (*tex_co)[3]; float weight = 1.0f; /* init value unused but some compilers may complain */ float (*vert_clnors)[3] = NULL; - float local_mat[4][4] = {0}; + float local_mat[4][4] = {{0}}; const bool use_global_direction = dmd->space == MOD_DISP_SPACE_GLOBAL; if (!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) return; |