diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 08:31:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 08:31:05 +0400 |
| commit | f5c66a3676da2141b240896ad701689f83f5a143 (patch) | |
| tree | 30261e91296a32369591d76568860380eae08889 /source/blender/render | |
| parent | 00b39c4e5b91b4291bb41a0ea1f7413d8aeba9f9 (diff) | |
quiet shadow warnings and remove redundant NULL check
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 3d93c207493..e29cea279ce 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4719,11 +4719,8 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d NULL, NULL, NULL, NULL); } - if (dob) { - copy_v3_v3(obi->dupliorco, dob->orco); - obi->dupliuv[0]= dob->uv[0]; - obi->dupliuv[1]= dob->uv[1]; - } + copy_v3_v3(obi->dupliorco, dob->orco); + copy_v2_v2(obi->dupliuv, dob->uv); } static void init_render_object_data(Render *re, ObjectRen *obr, int timeoffset) |