[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26554] trunk/blender/source/blender/ editors/space_view3d/space_view3d.c: Fix for a recent bugfix removing the wm* opengl function replacements,

[Brecht Van Lommel]

Revision: 26554
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26554
Author:   blendix
Date:     2010-02-02 17:31:29 +0100 (Tue, 02 Feb 2010)

Log Message:
-----------
Fix for a recent bugfix removing the wm* opengl function replacements,
broke drawing duplis.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-02-02 15:52:06 UTC (rev 26553)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-02-02 16:31:29 UTC (rev 26554)
@@ -176,7 +176,10 @@
 	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);