diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-10 18:58:22 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-10 18:58:22 +0400 |
| commit | f838e3632d6cdf5fcc11f4c3ed044afeafa6e23f (patch) | |
| tree | 21dab2f7fee401a3212a622ed952b2decd737b1d /source/blender/blenkernel/BKE_main.h | |
| parent | 002cb94cc68f150344f8ee213c9b02c0b47c3f65 (diff) | |
| parent | 3cd2c6145ae12956757141a1ea1f58f5eddf0db1 (diff) | |
Merge branch 'master' into soc-2014-shapekey
Conflicts:
source/blender/editors/object/object_shapekey.c
Diffstat (limited to 'source/blender/blenkernel/BKE_main.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 82b03127237..ec654ea4b71 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -87,6 +87,8 @@ typedef struct Main { ListBase nodetree; ListBase brush; ListBase particle; + ListBase palettes; + ListBase paintcurves; ListBase wm; ListBase gpencil; ListBase movieclip; |