archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Math Lib: use variable length args for mul_serie_m3,m4 (instead of trailing NULL's)

Browse Source
This commit is contained in:
Campbell Barton
2014-07-20 14:01:42 +10:00
parent 3ca78a40e8
commit 7c7b7302d3
22 changed files with 203 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/render/intern/source/convertblender.c
View File

@@ -4546,8 +4546,7 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d
obi->duplitexmat= BLI_memarena_alloc(re->memArena, sizeof(float)*4*4);
invert_m4_m4(imat, dob->mat);
mul_serie_m4(obi->duplitexmat, re->viewmat, omat, imat, re->viewinv,
NULL, NULL, NULL, NULL);
mul_serie_m4(obi->duplitexmat, re->viewmat, omat, imat, re->viewinv);
}
copy_v3_v3(obi->dupliorco, dob->orco);