[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30472] branches/soc-2010-jwilkins/source/ blender/blenkernel/intern/material.c: * The area inside the MatCap texture is shrunk by 0. 95 to help eliminate artifacts on the edges of object when using a MatCap

[Jason Wilkins]

Revision: 30472
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30472
Author:   jwilkins
Date:     2010-07-18 20:02:52 +0200 (Sun, 18 Jul 2010)

Log Message:
-----------
* The area inside the MatCap texture is shrunk by 0.95 to help eliminate artifacts on the edges of object when using a MatCap
* Object Color is enabled in the MatCap material so that setting an objects color will tent the object that color.  You can set an object's color in the Object panel on the right.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c	2010-07-18 15:21:59 UTC (rev 30471)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c	2010-07-18 18:02:52 UTC (rev 30472)
@@ -81,9 +81,12 @@
 	default_mtex(&matcap_mtex);
 	matcap_mtex.texco = TEXCO_NORM;
 	matcap_mtex.tex = &matcap_tex;
+	matcap_mtex.size[0] = 0.95f;
+	matcap_mtex.size[1] = 0.95f;
 
 	init_material(&matcap_ma);
 	matcap_ma.mode |= MA_SHLESS;
+	matcap_ma.shade_flag |= MA_OBCOLOR;
 	matcap_ma.mtex[0] = &matcap_mtex;
 }