Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-05-17 14:31:39 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-17 14:38:42 +0300
commit2bb788d4cd928971979473e22223f86b418a4f34 (patch)
tree651e098125f1966e30b3a3b44093db51a18a458f /source/blender/draw/intern/draw_manager_data.c
parent52669dda8049e05eaf0bc8147ef477a05c3717da (diff)
Cleanup: Eevee: Remove custom volumetric matrix
This was the same as using the inverse obmat.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_data.c')
-rw-r--r--source/blender/draw/intern/draw_manager_data.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index e47433e60ab..f8ef1bcf065 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -351,7 +351,7 @@ static void drw_call_state_update_matflag(DRWCallState *state,
DRWShadingGroup *shgroup,
Object *ob)
{
- uint16_t new_flags = ((state->matflag ^ shgroup->matflag) & shgroup->matflag);
+ uchar new_flags = ((state->matflag ^ shgroup->matflag) & shgroup->matflag);
/* HACK: Here we set the matflags bit to 1 when computing the value
* so that it's not recomputed for other drawcalls.
@@ -393,8 +393,6 @@ static DRWCallState *drw_call_state_create(DRWShadingGroup *shgroup, float (*obm
state->visibility_cb = NULL;
state->matflag = 0;
- drw_call_state_update_matflag(state, shgroup, ob);
-
/* Matrices */
if (obmat != NULL) {
copy_m4_m4(state->model, obmat);
@@ -407,6 +405,8 @@ static DRWCallState *drw_call_state_create(DRWShadingGroup *shgroup, float (*obm
unit_m4(state->model);
}
+ drw_call_state_update_matflag(state, shgroup, ob);
+
if (ob != NULL) {
float corner[3];
BoundBox *bbox = BKE_object_boundbox_get(ob);