quiet shadow warnings and remove redundant NULL check
[blender.git] / source / blender / render / intern / source / convertblender.c
index 3d93c20749308fb4145b6753d5cf47bef6390b10..e29cea279cec4497402378e22295ddd7873a0aae 100644 (file)
@@ -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)