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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-02 19:31:29 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-02 19:31:29 +0300
commitd20397661fa73bba6806d03dded414f5970db065 (patch)
tree864678075095d46669b881a9245916a4c8f74cd2 /source/blender/editors/space_view3d/space_view3d.c
parentf80617ab37c3ed09e6ef5513e53ecf37fd692f36 (diff)
Fix for a recent bugfix removing the wm* opengl function replacements,
broke drawing duplis.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 6b653ccba89..97ae94cae26 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -176,7 +176,10 @@ void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d)
mul_m4_m4m4(rv3d->viewmatob, ob->obmat, rv3d->viewmat);
mul_m4_m4m4(rv3d->persmatob, ob->obmat, rv3d->persmat);
- glLoadMatrixf(rv3d->viewmatob);
+ /* we have to multiply instead of loading viewmatob to make
+ it work with duplis using displists, otherwise it will
+ override the dupli-matrix */
+ glMultMatrixf(ob->obmat);
/* initializes object space clipping, speeds up clip tests */
ED_view3d_local_clipping(rv3d, ob->obmat);