[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42920] trunk/blender/source/blender: make MOD_dynamicpaint. c use more typical gpl2+ text and some formatting edits in DNA
Campbell Barton
ideasman42 at gmail.com
Wed Dec 28 12:08:43 CET 2011
Revision: 42920
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42920
Author: campbellbarton
Date: 2011-12-28 11:08:38 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
make MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_actuator_types.h
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_documentation.h
trunk/blender/source/blender/makesdna/DNA_material_types.h
trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesdna/DNA_node_types.h
trunk/blender/source/blender/makesdna/DNA_particle_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_actuator_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_actuator_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_actuator_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_constraint_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_constraint_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_documentation.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_documentation.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_documentation.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_material_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_material_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_material_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -77,11 +77,11 @@
struct Image *tpage;
char flag, transp;
short mode,tile,unwrap;
-}MTexPoly;
+} MTexPoly;
typedef struct MLoopUV {
float uv[2];
-}MLoopUV;
+} MLoopUV;
typedef struct MLoopCol {
char a, r, g, b;
@@ -104,7 +104,7 @@
} MTFace;
/*Custom Data Properties*/
-typedef struct MFloatProperty{
+typedef struct MFloatProperty {
float f;
} MFloatProperty;
typedef struct MIntProperty {
@@ -173,7 +173,7 @@
/** End Multires **/
-typedef struct MRecast{
+typedef struct MRecast {
int i;
} MRecast;
Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -704,7 +704,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: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_particle_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_particle_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_particle_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2011-12-28 10:27:25 UTC (rev 42919)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2011-12-28 11:08:38 UTC (rev 42920)
@@ -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)
#define NDOF_SHOULD_ROTATE (1 << 5)
/* orbit navigation modes
- only two options, so it's sort of a hyrbrid bool/enum
- if ((U.ndof_flag & NDOF_ORBIT_MODE) == NDOF_OM_OBJECT)... */
+ * only two options, so it's sort of a hyrbrid bool/enum
+ * if ((U.ndof_flag & NDOF_ORBIT_MODE) == NDOF_OM_OBJECT)... */
/*
#define NDOF_ORBIT_MODE (1 << 6)
#define NDOF_OM_TARGETCAMERA 0
#define NDOF_OM_OBJECT NDOF_ORBIT_MODE
*/
/* actually... users probably don't care about what the mode
- is called, just that it feels right */
+ * is called, just that it feels right */
/* zoom is up/down if this flag is set (otherwise forward/backward) */
#define NDOF_ZOOM_UPDOWN (1 << 7)
#define NDOF_ZOOM_INVERT (1 << 8)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list