diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:36:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:36:12 +0300 |
| commit | 0eb9d2adc6d70bd611803201881ef63e341c80f5 (patch) | |
| tree | 5e802e0e0d16d2670e80be04b491ed29b238ac68 /source/blender/makesdna | |
| parent | 885d78150d092756c44519dd9fd19a4d88f02354 (diff) | |
| parent | f9f64ca4a3170fda239ac27542046942cce23876 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 407d59f09da..fc3b4afe18d 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -72,7 +72,7 @@ typedef struct Brush { float rake_factor; /* rake actual data (not texture), used for sculpt */ short blend; /* blend mode */ - short ob_mode; /* & with ob->mode to see if the brush is compatible, use for display only. */ + short ob_mode; /* eObjectMode: to see if the brush is compatible, use for display only. */ float weight; /* brush weight */ int size; /* brush diameter */ int flag; /* general purpose flag */ |