* Made Armature auto name L/R, Top/Bot, Fr/Bk remove existing, known extensions.

* Added fromDupli MTex setting to python api
* Shift+RMB was setting the active face in the UV view.
* Armature scripts menu was broken

2 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/python/api2_2x/MTex.c b/source/blender/python/api2_2x/MTex.c
index 61d809411a1..df422bd54e0 100644
--- a/source/blender/python/api2_2x/MTex.c
+++ b/source/blender/python/api2_2x/MTex.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: MTex.c 10279 2007-03-16 11:38:02Z campbellbarton $
+ * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
@@ -145,6 +145,9 @@ static PyGetSetDef MTex_getseters[] = {
 	{ "correctNor", (getter) MTex_getFlag, (setter) MTex_setFlag,
 		"Correct normal mapping for Texture space and Object space",
 		(void*) MTEX_VIEWSPACE },
+	{ "fromDupli", (getter) MTex_getFlag, (setter) MTex_setFlag,
+		"If object is duplicated by vertices, faces or particles, inherit texture coordinate from parent object",
+		(void*) MTEX_DUPLI_MAPTO },
 	{ "xproj", (getter) MTex_getProjX, (setter) MTex_setProjX,
 		"Projection of X axis to Texture space", NULL },
 	{ "yproj", (getter) MTex_getProjY, (setter) MTex_setProjY,
diff --git a/source/blender/python/api2_2x/doc/Texture.py b/source/blender/python/api2_2x/doc/Texture.py
index 184d769171f..8b29d91ca19 100644
--- a/source/blender/python/api2_2x/doc/Texture.py
+++ b/source/blender/python/api2_2x/doc/Texture.py
@@ -515,6 +515,7 @@ class MTex:
 	@ivar neg: Negate texture values mode
 	@ivar noRGB: Convert texture RGB values to intensity values
 	@ivar correctNor: Correct normal mapping for Texture space and Object space
+	@ivar fromDupli: If object is duplicated by vertices, faces or particles, inherit texture coordinate from parent object
 	@ivar xproj: Projection of X axis to Texture space. L{Proj}
 	@ivar yproj: Projection of Y axis to Texture space. L{Proj}
 	@ivar zproj: Projection of Z axis to Texture space. L{Proj}