Fix stupid merge error.

2016-06-27 16:07:38 +02:00
parent cbce7fef16
commit 0f927d6eca
1 changed files with 1 additions and 0 deletions
--- 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)
 {