[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11506] branches/soc-2007-maike/source/ blender/src/drawobject.c: Added Mballs
Miguel Torres Lima
torreslima at gmail.com
Mon Aug 6 18:34:01 CEST 2007
Revision: 11506
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11506
Author: maike
Date: 2007-08-06 18:34:01 +0200 (Mon, 06 Aug 2007)
Log Message:
-----------
Added Mballs
Modified Paths:
--------------
branches/soc-2007-maike/source/blender/src/drawobject.c
Modified: branches/soc-2007-maike/source/blender/src/drawobject.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/drawobject.c 2007-08-06 16:33:31 UTC (rev 11505)
+++ branches/soc-2007-maike/source/blender/src/drawobject.c 2007-08-06 16:34:01 UTC (rev 11506)
@@ -3240,6 +3240,7 @@
glEnd();
}
+
/* return 1 if nothing was drawn */
static int drawmball(Base *base, int dt)
{
@@ -3730,9 +3731,13 @@
if(glsl_active() && (base->lay & G.vd->lay)){
if(G.vd->drawtype == OB_SHADED && G.obedit != ob && (OBACT != ob || !(G.f & (G_FACESELECT|G_WEIGHTPAINT|G_TEXTUREPAINT|G_VERTEXPAINT|G_SCULPTMODE)))){
if(ob->type == OB_MESH){ /*|| ob->type == OB_SURF || ob->type == OB_CURVE || ob->type == OB_FONT || ob->type == OB_MBALL){ */
- glsl_draw(base);
+ glsl_draw(base->object, base->flag);
return;
}
+ else if(ob->type == OB_MBALL){
+ glsl_draw_mball(base);
+ return;
+ }
}
}
/* GLSL draw end */
@@ -4487,4 +4492,3 @@
if(edm) edm->release(edm);
if(dm) dm->release(dm);
}
-
More information about the Bf-blender-cvs
mailing list