Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaja Kedia(miyagix) <rajakedia2222@gmail.com>2017-12-14 21:47:35 +0300
committerRaja Kedia(miyagix) <rajakedia2222@gmail.com>2017-12-14 21:47:35 +0300
commit450eb4ef6c54108e16164aa0820ee00fea9b8b48 (patch)
tree643a8c2b026205961d2539ac7a5bf363e5f5f500 /source/blender/blenkernel/intern/group.c
parent31d5262cece4c5644a36cf0511bc42007a2c1e6d (diff)
parentba256b32ee5d3ab7991fe5abbb47071ccfe8577c (diff)
Merge remote-tracking branch 'origin' into soc-2017-sculpting_brushsoc-2017-sculpting_brush
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
-rw-r--r--source/blender/blenkernel/intern/group.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 9b011dbb003..932f41ac4ba 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -80,6 +80,8 @@ Group *BKE_group_add(Main *bmain, const char *name)
Group *group;
group = BKE_libblock_alloc(bmain, ID_GR, name);
+ id_us_min(&group->id);
+ id_us_ensure_real(&group->id);
group->layer = (1 << 20) - 1;
group->preview = NULL;
@@ -87,7 +89,7 @@ Group *BKE_group_add(Main *bmain, const char *name)
return group;
}
-Group *BKE_group_copy(Main *bmain, Group *group)
+Group *BKE_group_copy(Main *bmain, const Group *group)
{
Group *groupn;