diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-27 17:07:38 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-27 17:07:38 +0300 |
| commit | 0f927d6ecab28804fca749385437c2b7fb3c6e24 (patch) | |
| tree | 8c5a67d034a53ee1dc295747c8682869ce0b9ded /source/blender/makesrna/intern/rna_main_api.c | |
| parent | cbce7fef1604fdfd3099fd196b2a44f61b22eb76 (diff) | |
Fix stupid merge error.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index c30414ab585..010e65bdf4b 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -440,6 +440,7 @@ static bAction *rna_Main_actions_new(Main *bmain, const char *name) bAction *act = add_empty_action(bmain, name); id_fake_user_clear(&act->id); return act; +} static Palette *rna_Main_palettes_new(Main *bmain, const char *name) { |