Commit: 0f927d6ecab28804fca749385437c2b7fb3c6e24
Author: Bastien Montagne
Date: Mon Jun 27 16:07:38 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB0f927d6ecab28804fca749385437c2b7fb3c6e24
Fix stupid merge error.
===================================================================
M source/blender/makesrna/intern/rna_main_api.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_main_api.c
b/source/blender/makesrna/intern/rna_main_api.c
index c30414a..010e65b 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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
