[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42921] branches/bmesh/blender: svn merge ^/trunk/blender -r42918:42920

Campbell Barton ideasman42 at gmail.com
Wed Dec 28 12:20:46 CET 2011


Revision: 42921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42921
Author:   campbellbarton
Date:     2011-12-28 11:20:45 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42918:42920

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42918

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_documentation.h
    branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42918
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42920

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_ID.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_ID.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -57,7 +57,7 @@
 				seemed like a good idea as a pad var was needed anyway :)*/
 	IDPropertyData data;	/* note, alignment for 64 bits */
 	int len; /* array length, also (this is important!) string length + 1.
-				the idea is to be able to reuse array realloc functions on strings.*/
+	          * the idea is to be able to reuse array realloc functions on strings.*/
 	/* totallen is total length of allocated array/string, including a buffer.
 	 * Note that the buffering is mild; the code comes from python's list implementation.*/
 	int totallen; /*strings and arrays are both buffered, though the buffer isn't
@@ -74,7 +74,7 @@
 #define IDP_ARRAY		5
 #define IDP_GROUP		6
 /* the ID link property type hasn't been implemented yet, this will require
-   some cleanup of blenkernel, most likely.*/
+ * some cleanup of blenkernel, most likely.*/
 #define IDP_ID			7
 #define IDP_DOUBLE		8
 #define IDP_IDPARRAY	9

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -194,7 +194,7 @@
 	int flag;
 } bVisibilityActuator;
 
-typedef struct bTwoDFilterActuator{
+typedef struct bTwoDFilterActuator {
 	char pad[4];
 	/* Tells what type of 2D Filter */
 	short type;
@@ -205,7 +205,7 @@
 	/* a float argument */
 	float float_arg;
 	struct Text *text;
-}bTwoDFilterActuator;
+} bTwoDFilterActuator;
 
 typedef struct bParentActuator {
 	char pad[2];

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -132,7 +132,7 @@
 #define BRUSH_CUSTOM_ICON (1<<28)
 
 /* temporary flag which sets up autmatically for correct
-   brush drawing when inverted modal operator is running */
+ * brush drawing when inverted modal operator is running */
 #define BRUSH_INVERTED (1<<29)
 
 /* Brush.sculpt_tool */

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -126,10 +126,10 @@
 
 
 /* Inverse-Kinematics (IK) constraint
-   This constraint supports a variety of mode determine by the type field 
-   according to B_CONSTRAINT_IK_TYPE.
-   Some fields are used by all types, some are specific to some types
-   This is indicated in the comments for each field
+ * This constraint supports a variety of mode determine by the type field
+ * according to B_CONSTRAINT_IK_TYPE.
+ * Some fields are used by all types, some are specific to some types
+ * This is indicated in the comments for each field
  */
 typedef struct bKinematicConstraint {
 	struct Object		*tar;			/* All: target object in case constraint needs a target */

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_documentation.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_documentation.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_documentation.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -63,14 +63,12 @@
 
  * \section dnanote NOTE
 
-  PLEASE READ INSTRUCTIONS ABOUT ADDING VARIABLES IN 'DNA' STRUCTS IN
+ * PLEASE READ INSTRUCTIONS ABOUT ADDING VARIABLES IN 'DNA' STRUCTS IN
+ *
+ * intern/dna_genfile.c
+ * (ton)
 
-  intern/dna_genfile.c
-  (ton)
-
  */
 
 
-
 /* This file has intentionally no definitions or implementation. */
-

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -168,8 +168,8 @@
 	short sss_flag, sss_preset;
 
 	int mapto_textured;	/* render-time cache to optimise texture lookups */
-	short shadowonly_flag;		/* "shadowsonly" type */
-        short index;    /* custom index for render passes */
+	short shadowonly_flag;  /* "shadowsonly" type */
+	short index;            /* custom index for render passes */
 
 	ListBase gpumaterial;		/* runtime */
 } Material;

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -95,12 +95,12 @@
 	struct Image *tpage;
 	char flag, transp;
 	short mode,tile,unwrap;
-}MTexPoly;
+} MTexPoly;
 
 typedef struct MLoopUV {
 	float uv[2];
 	int flag;
-}MLoopUV;
+} MLoopUV;
 
 /*mloopuv->flag*/
 #define MLOOPUV_EDGESEL	1
@@ -131,7 +131,7 @@
 } MTFace;
 
 /*Custom Data Properties*/
-typedef struct MFloatProperty{
+typedef struct MFloatProperty {
 	float	f;
 } MFloatProperty;
 typedef struct MIntProperty {
@@ -200,7 +200,7 @@
 
 /** End Multires **/
 
-typedef struct MRecast{
+typedef struct MRecast {
 	int		i;
 } MRecast;
 

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -708,7 +708,7 @@
 #define MOD_SIMPLEDEFORM_LOCK_AXIS_Y			(1<<1)
 
 /* indicates whether simple deform should use the local
-   coordinates or global coordinates of origin */
+ * coordinates or global coordinates of origin */
 #define MOD_SIMPLEDEFORM_ORIGIN_LOCAL			(1<<0)
 
 #define MOD_UVPROJECT_MAX				10

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -354,12 +354,12 @@
 	float t1,t2,t3;
 	float fsize,fstrength,falpha;
 	float key[4];
-   short algorithm, channel;
+	short algorithm, channel;
 } NodeChroma;
 
 typedef struct NodeTwoXYs {
 	short x1, x2, y1, y2;
-   float fac_x1, fac_x2, fac_y1, fac_y2;
+	float fac_x1, fac_x2, fac_y1, fac_y2;
 } NodeTwoXYs;
 
 typedef struct NodeTwoFloats {
@@ -428,7 +428,7 @@
 	short limchan, unspill;
 	float limscale;
 	float uspillr, uspillg, uspillb;
-}NodeColorspill;
+} NodeColorspill;
 
 typedef struct NodeTexBase {
 	TexMapping tex_mapping;

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -65,7 +65,7 @@
 typedef struct ParticleSpring {
 	float rest_length;
 	unsigned int particle_index[2], delete_flag;
-}ParticleSpring;
+} ParticleSpring;
 
 /* Child particles are created around or between parent particles */
 typedef struct ChildParticle {
@@ -295,7 +295,7 @@
 
 	float dt_frac;							/* current time step, as a fraction of a frame */
 	float _pad;								/* spare capacity */
-}ParticleSystem;
+} ParticleSystem;
 
 /* part->type */
 /* hair is allways baked static in object/geometry space */

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -347,9 +347,9 @@
 
 #define SEQ_BLEND_REPLACE      0
 /* all other BLEND_MODEs are simple SEQ_EFFECT ids and therefore identical
-   to the table above. (Only those effects that handle _exactly_ two inputs,
-   otherwise, you can't really blend, right :) !)
-*/
+ * to the table above. (Only those effects that handle _exactly_ two inputs,
+ * otherwise, you can't really blend, right :) !)
+ */
 
 
 #define SEQ_HAS_PATH(_seq) (ELEM5((_seq)->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_RAM_SOUND, SEQ_HD_SOUND))

Modified: branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h	2011-12-28 11:08:38 UTC (rev 42920)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h	2011-12-28 11:20:45 UTC (rev 42921)
@@ -603,20 +603,20 @@
 #define NDOF_FLY_HELICOPTER (1 << 1)
 #define NDOF_LOCK_HORIZON   (1 << 2)
 /* the following might not need to be saved between sessions,
-   but they do need to live somewhere accessible... */
+ * but they do need to live somewhere accessible... */
 #define NDOF_SHOULD_PAN     (1 << 3)
 #define NDOF_SHOULD_ZOOM    (1 << 4)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list