diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-07 15:43:28 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-07 15:43:28 +0300 |
| commit | dc5367c97bfff8ccec939ffb3105dcc451b69dff (patch) | |
| tree | 0a5085b4511ac73db8e2d13673aec9138d151a63 /source/blender/makesdna/DNA_object_force.h | |
| parent | 4789c5ca6d0317a4d1745bec454319ead99f20b1 (diff) | |
| parent | 8c5826f59a37924866ed7dd5bda7fb39c44e8227 (diff) | |
Merge branch 'master' into cycles_split_kernelcycles_split_kernel
Diffstat (limited to 'source/blender/makesdna/DNA_object_force.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 59acefeffe4..ed14c4b9311 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -372,6 +372,7 @@ typedef struct SoftBody { #define PFIELD_DO_ROTATION (1<<15) #define PFIELD_GUIDE_PATH_WEIGHT (1<<16) /* apply curve weights */ #define PFIELD_SMOKE_DENSITY (1<<17) /* multiply smoke force by density */ +#define PFIELD_GRAVITATION (1<<18) /* used for (simple) force */ /* pd->falloff */ #define PFIELD_FALL_SPHERE 0 |