[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12734] trunk/blender/source/blender: dupliFaceScale wasnt being initialized for new objects, added Python api access

[Campbell Barton]

Revision: 12734
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12734
Author:   campbellbarton
Date:     2007-11-30 15:10:36 +0100 (Fri, 30 Nov 2007)

Log Message:
-----------
dupliFaceScale wasnt being initialized for new objects, added Python api access

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/python/api2_2x/Object.c
    trunk/blender/source/blender/python/api2_2x/doc/Object.py

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2007-11-30 13:45:23 UTC (rev 12733)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2007-11-30 14:10:36 UTC (rev 12734)
@@ -913,6 +913,7 @@
 	ob->ipowin= ID_OB;	/* the ipowin shown */
 	ob->dupon= 1; ob->dupoff= 0;
 	ob->dupsta= 1; ob->dupend= 100;
+	ob->dupfacesca = 1.0;
 
 	/* Game engine defaults*/
 	ob->mass= ob->inertia= 1.0f;

Modified: trunk/blender/source/blender/python/api2_2x/Object.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Object.c	2007-11-30 13:45:23 UTC (rev 12733)
+++ trunk/blender/source/blender/python/api2_2x/Object.c	2007-11-30 14:10:36 UTC (rev 12734)
@@ -172,6 +172,7 @@
 	EXPP_OBJ_ATTR_DUPOFF,
 	EXPP_OBJ_ATTR_DUPSTA,
 	EXPP_OBJ_ATTR_DUPEND,
+ 	EXPP_OBJ_ATTR_DUPFACESCALEFAC,
 	EXPP_OBJ_ATTR_TIMEOFFSET,
 	EXPP_OBJ_ATTR_DRAWSIZE,
 	EXPP_OBJ_ATTR_PARENT_TYPE,
@@ -276,6 +277,8 @@
 #define EXPP_OBJECT_SBINSPRINGMAX      0.999f
 #define EXPP_OBJECT_SBINFRICTMIN         0.0f
 #define EXPP_OBJECT_SBINFRICTMAX        10.0f
+#define EXPP_OBJECT_DUPFACESCALEFACMIN  0.001f
+#define EXPP_OBJECT_DUPFACESCALEFACMAX  10000.0f
 
 /*****************************************************************************/
 /* Python API function prototypes for the Blender module.		 */
@@ -3843,6 +3846,9 @@
 	case EXPP_OBJ_ATTR_SB_INFRICT:
     	param = object->soft->infrict;
 		break;
+	case EXPP_OBJ_ATTR_DUPFACESCALEFAC:
+		param = object->dupfacesca;
+		break;
 	default:
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError, 
 				"undefined type in getFloatAttr" );
@@ -3990,6 +3996,12 @@
 		max = EXPP_OBJECT_SBINFRICTMAX;
     	param = &self->object->soft->infrict;
 		break;
+	case EXPP_OBJ_ATTR_DUPFACESCALEFAC:
+		min = EXPP_OBJECT_DUPFACESCALEFACMIN;
+		max = EXPP_OBJECT_DUPFACESCALEFACMAX;
+		param = &self->object->dupfacesca;
+		break;
+		
 	default:
 		return EXPP_ReturnIntError( PyExc_RuntimeError,
 				"undefined type in setFloatAttrClamp" );
@@ -4984,6 +4996,10 @@
 	 (getter)Object_getTransflagBits, (setter)Object_setTransflagBits,
 	 "Use face scale to scale all dupliFaces",
 	 (void *)OB_DUPLIFACES_SCALE},
+	{"dupFacesScaleFac",
+ 	 (getter)getFloatAttr, (setter)setFloatAttr,
+	"Use face scale to scale all dupliFaces",
+	 (void *)EXPP_OBJ_ATTR_DUPFACESCALEFAC},
 	{"enableDupFrames",
 	 (getter)Object_getTransflagBits, (setter)Object_setTransflagBits,
 	 "Make copy of object for every frame",

Modified: trunk/blender/source/blender/python/api2_2x/doc/Object.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Object.py	2007-11-30 13:45:23 UTC (rev 12733)
+++ trunk/blender/source/blender/python/api2_2x/doc/Object.py	2007-11-30 14:10:36 UTC (rev 12734)
@@ -428,6 +428,8 @@
 	@type enableDupFaces: boolean
 	@ivar enableDupFacesScale: The DupliFacesScale status of the object.
 	@type enableDupFacesScale: boolean
+	@ivar dupFacesScaleFac: Scale factor for dupliface instance, 1.0 by default.
+	@type dupFacesScaleFac: float	
 	@ivar enableDupFrames: The DupliFrames status of the object.
 		Does not indicate that this object has any dupliFrames,
 		(as returned by L{DupObjects}) just that dupliFrames are enabled.