[Bf-blender-cvs] [3f0d4ec] soc-2013-paint: fix error in last merge
Antony Riakiotakis
noreply at git.blender.org
Wed Feb 12 17:13:34 CET 2014
Commit: 3f0d4ec0f7aaf408a9f848530f39b0b471406e4f
Author: Antony Riakiotakis
Date: Wed Feb 12 18:09:44 2014 +0200
https://developer.blender.org/rB3f0d4ec0f7aaf408a9f848530f39b0b471406e4f
fix error in last merge
===================================================================
M source/blender/blenkernel/intern/paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index c61e454..8085689 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -292,7 +292,7 @@ Palette *BKE_palette_add(Main *bmain, const char *name)
{
Palette *palette;
- palette = BKE_libblock_alloc(&bmain->palettes, ID_PAL, name);
+ palette = BKE_libblock_alloc(bmain, ID_PAL, name);
/* enable fake user by default */
palette->id.flag |= LIB_FAKEUSER;
More information about the Bf-blender-cvs
mailing list