From ec8d277c64346770b99716b3c1bbdcd07eae26f6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 May 2013 18:36:25 +0000 Subject: BLI_math rename functions: - mult_m4_m4m4 -> mul_m4_m4m4 - mult_m3_m3m4 -> mul_m3_m3m4 these temporary names were used to avoid problems when argument order was switched. --- source/blender/gpu/intern/gpu_material.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/gpu') diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index a793286bceb..044b699a042 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -290,13 +290,13 @@ void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double tim } if (material->dynproperty & DYN_LAMP_IMAT) { - mult_m4_m4m4(lamp->dynimat, lamp->imat, viewinv); + mul_m4_m4m4(lamp->dynimat, lamp->imat, viewinv); } if (material->dynproperty & DYN_LAMP_PERSMAT) { if (!GPU_lamp_has_shadow_buffer(lamp)) /* The lamp matrices are already updated if we're using shadow buffers */ GPU_lamp_update_buffer_mats(lamp); - mult_m4_m4m4(lamp->dynpersmat, lamp->persmat, viewinv); + mul_m4_m4m4(lamp->dynpersmat, lamp->persmat, viewinv); } } @@ -1884,7 +1884,7 @@ void GPU_lamp_update_buffer_mats(GPULamp *lamp) normalize_v3(lamp->viewmat[2]); /* makeshadowbuf */ - mult_m4_m4m4(persmat, lamp->winmat, lamp->viewmat); + mul_m4_m4m4(persmat, lamp->winmat, lamp->viewmat); /* opengl depth buffer is range 0.0..1.0 instead of -1.0..1.0 in blender */ unit_m4(rangemat); @@ -1895,7 +1895,7 @@ void GPU_lamp_update_buffer_mats(GPULamp *lamp) rangemat[3][1] = 0.5f; rangemat[3][2] = 0.5f; - mult_m4_m4m4(lamp->persmat, rangemat, persmat); + mul_m4_m4m4(lamp->persmat, rangemat, persmat); } void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[4][4], int *winsize, float winmat[4][4]) -- cgit v1.2.3