Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-07-20 14:41:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-07-20 14:41:08 +0400
commit75410037fd0d5ec81ef24c70789b9a684ca86f3f (patch)
tree2dd932c031fcfb729688e28b701f843cd5487593 /source/blender/makesdna
parentef9357365c057e88d79c0701604cb2175d030520 (diff)
- correct some spelling errors.
- remove FreeCamera struct (wasnt used) - remove world color alpha values (not used anywhre).
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_actuator_types.h7
-rw-r--r--source/blender/makesdna/DNA_curve_types.h2
-rw-r--r--source/blender/makesdna/DNA_sdna_types.h2
-rw-r--r--source/blender/makesdna/DNA_world_types.h10
-rw-r--r--source/blender/makesdna/intern/makesdna.c6
5 files changed, 10 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 03200b784b4..7c9a37072af 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -236,13 +236,6 @@ typedef struct bActuator {
} bActuator;
-typedef struct FreeCamera {
- float mass, accelleration;
- float maxspeed, maxrotspeed, maxtiltspeed;
- int flag;
- float rotdamp, tiltdamp, speeddamp, pad;
-} FreeCamera;
-
/* objectactuator->flag */
#define ACT_FORCE_LOCAL 1
#define ACT_TORQUE_LOCAL 2
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index d27ab8f125d..609c3a87dab 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -328,7 +328,7 @@ typedef enum eBezTriple_KeyframeType {
#define CU_CHINFO_BOLD (1<<0)
#define CU_CHINFO_ITALIC (1<<1)
#define CU_CHINFO_UNDERLINE (1<<2)
-#define CU_CHINFO_WRAP (1<<3) /* wordwrap occured here */
+#define CU_CHINFO_WRAP (1<<3) /* wordwrap occurred here */
#define CU_CHINFO_SMALLCAPS (1<<4)
#define CU_CHINFO_SMALLCAPS_CHECK (1<<5) /* set at runtime, checks if case switching is needed */
diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h
index 9b486e2851d..f2bdfeff9dd 100644
--- a/source/blender/makesdna/DNA_sdna_types.h
+++ b/source/blender/makesdna/DNA_sdna_types.h
@@ -47,7 +47,7 @@ typedef struct SDNA {
short *typelens; /* type lengths */
int nr_structs; /* number of struct types */
- short **structs; /* sp= structs[a] is the adress of a struct definintion
+ short **structs; /* sp= structs[a] is the address of a struct definintion
sp[0] is struct type number, sp[1] amount of members
(sp[2], sp[3]), (sp[4], sp[5]), .. are the member
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 66d31467c4a..42c80f4b8b5 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -52,11 +52,11 @@ typedef struct World {
short colormodel, totex;
short texact, mistype;
-
- /* TODO - hork, zenk and ambk are not used, should remove at some point (Campbell) */
- float horr, horg, horb, hork;
- float zenr, zeng, zenb, zenk;
- float ambr, ambg, ambb, ambk;
+
+ float horr, horg, horb;
+ float zenr, zeng, zenb;
+ float ambr, ambg, ambb;
+ float pad2;
unsigned int fastcol;
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index fc5307000e3..15c6bbd202c 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -138,11 +138,11 @@ int maxdata= 500000, maxnr= 50000;
int nr_names=0;
int nr_types=0;
int nr_structs=0;
-char **names, *namedata; /* at adress names[a] is string a */
-char **types, *typedata; /* at adress types[a] is string a */
+char **names, *namedata; /* at address names[a] is string a */
+char **types, *typedata; /* at address types[a] is string a */
short *typelens; /* at typelens[a] is de length of type a */
short *alphalens; /* contains sizes as they are calculated on the DEC Alpha (64 bits) */
-short **structs, *structdata; /* at sp= structs[a] is the first adress of a struct definition
+short **structs, *structdata; /* at sp= structs[a] is the first address of a struct definition
sp[0] is type number
sp[1] is amount of elements
sp[2] sp[3] is typenr, namenr (etc) */