diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-29 12:00:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-29 12:00:07 +0300 |
| commit | adf4d0e3e307bef203104d49a92d7b0833be2856 (patch) | |
| tree | 396221f8576eae889689a2581d45212612bd712e /source/blender/editors/space_view3d/drawobject.c | |
| parent | b4e5161b02a6522c6fd0a37369f37f5c9e47a73f (diff) | |
| parent | 029bd44bbd0fc6c1c59c6cb37f9e70c4dd23f91d (diff) | |
Merge branch 'master' into alembic
Conflicts:
intern/cycles/blender/blender_sync.h
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 4fcfeb83128..b95054e397d 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -8022,9 +8022,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short /* don't show smoke before simulation starts, this could be made an option in the future */ if (smd->domain->fluid && CFRA >= smd->domain->point_cache[0]->startframe) { /* get view vector */ - copy_v3_v3(viewnormal, rv3d->viewinv[2]); invert_m4_m4(ob->imat, ob->obmat); - mul_mat3_m4_v3(ob->imat, viewnormal); + mul_v3_mat3_m4v3(viewnormal, ob->imat, rv3d->viewinv[2]); normalize_v3(viewnormal); /* set dynamic boundaries to draw the volume |