svn merge ^/trunk/blender -r41005:41075

4 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 492dd34caa6..db574160771 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -340,8 +340,8 @@ typedef struct bPose {
 	void *ikdata;				/* temporary IK data, depends on the IK solver. Not saved in file */
 	void *ikparam;				/* IK solver parameters, structure depends on iksolver */ 
 	
-	bAnimVizSettings avs;		/* settings for visualisation of bone animation */
-	char proxy_act_bone[32];           /*proxy active bone name*/
+	bAnimVizSettings avs;		/* settings for visualization of bone animation */
+	char proxy_act_bone[32];    /* proxy active bone name*/
 } bPose;
 
 
@@ -423,6 +423,8 @@ typedef enum eItasc_Solver {
  * This is also exploited for bone-groups. Bone-Groups are stored per bPose, and are used 
  * primarily to color bones in the 3d-view. There are other benefits too, but those are mostly related
  * to Action-Groups.
+ *
+ * Note that these two uses each have their own RNA 'ActionGroup' and 'BoneGroup'.
  */
 typedef struct bActionGroup {
 	struct bActionGroup *next, *prev;
@@ -651,7 +653,7 @@ typedef enum eAnimEdit_AutoSnap {
  * Constraint Channels in certain situations. 
  *
  * Action-Channels can only belong to one group at a time, but they still live the Action's
- * list of achans (to preserve backwards compatability, and also minimise the code
+ * list of achans (to preserve backwards compatibility, and also minimize the code
  * that would need to be recoded). Grouped achans are stored at the start of the list, according
  * to the position of the group in the list, and their position within the group. 
  */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index e04bdd4ec45..00f6f2433af 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -228,7 +228,7 @@ typedef struct bMinMaxConstraint {
 	int			minmaxflag;
 	float		offset;
 	int			flag;
-	short		sticky, stuck, pad1, pad2; /* for backward compatability */
+	short		sticky, stuck, pad1, pad2; /* for backward compatibility */
 	float		cache[3];
 	char		subtarget[32];
 } bMinMaxConstraint;
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 8fe8b3bcf70..201ea8994ca 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -30,7 +30,7 @@
  *  \deprecated
  *   The contents of this file are now officially depreceated. They were used for the 'old' animation system,
  *   which has (as of 2.50) been replaced with a completely new system by Joshua Leung (aligorith). All defines, 
- *   etc. are only still maintained to provide backwards compatability for old files.
+ *   etc. are only still maintained to provide backwards compatibility for old files.
  */
  
 #ifndef DNA_IPO_TYPES_H
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 9fec5207dbb..da2fce4da82 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -386,7 +386,8 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_DRAW_HEALTH	16
 #define PART_ABS_PATH_TIME  32
 #define PART_DRAW_COUNT_GR	64
-#define PART_DRAW_BB_LOCK	128
+#define PART_DRAW_BB_LOCK	128	/* used with billboards */
+#define PART_DRAW_ROTATE_OB 128 /* used with dupliobjects/groups */
 #define PART_DRAW_PARENT	256
 #define PART_DRAW_NUM		512
 #define PART_DRAW_RAND_GR	1024