archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/collada/DocumentImporter.cpp
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_modifier.c
This commit is contained in:
Bastien Montagne
2018-06-12 12:58:31 +02:00
parent c98b2e74df be57cf9b2a
commit 43eebdfebd
12 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/object.c
View File

@@ -2969,7 +2969,7 @@ void BKE_object_delete_ptcache(Object *ob, int index)
/* shape key utility function */
/************************* Mesh ************************/
static KeyBlock *insert_meshkey(Object *ob, const char *name, const bool from_mix)
static KeyBlock *insert_meshkey(Main *bmain, Object *ob, const char *name, const bool from_mix)
{
Mesh *me = ob->data;
Key *key = me->key;
@@ -2977,7 +2977,7 @@ static KeyBlock *insert_meshkey(Object *ob, const char *name, const bool from_mi
int newkey = 0;
if (key == NULL) {
key = me->key = BKE_key_add((ID *)me);
key = me->key = BKE_key_add(bmain, (ID *)me);
key->type = KEY_RELATIVE;
newkey = 1;
}
@@ -3001,7 +3001,7 @@ static KeyBlock *insert_meshkey(Object *ob, const char *name, const bool from_mi
return kb;
}
/************************* Lattice ************************/
static KeyBlock *insert_lattkey(Object *ob, const char *name, const bool from_mix)
static KeyBlock *insert_lattkey(Main *bmain, Object *ob, const char *name, const bool from_mix)
{
Lattice *lt = ob->data;
Key *key = lt->key;
@@ -3009,7 +3009,7 @@ static KeyBlock *insert_lattkey(Object *ob, const char *name, const bool from_mi
int newkey = 0;
if (key == NULL) {
key = lt->key = BKE_key_add((ID *)lt);
key = lt->key = BKE_key_add(bmain, (ID *)lt);
key->type = KEY_RELATIVE;
newkey = 1;
}
@@ -3039,7 +3039,7 @@ static KeyBlock *insert_lattkey(Object *ob, const char *name, const bool from_mi
return kb;
}
/************************* Curve ************************/
static KeyBlock *insert_curvekey(Object *ob, const char *name, const bool from_mix)
static KeyBlock *insert_curvekey(Main *bmain, Object *ob, const char *name, const bool from_mix)
{
Curve *cu = ob->data;
Key *key = cu->key;
@@ -3048,7 +3048,7 @@ static KeyBlock *insert_curvekey(Object *ob, const char *name, const bool from_m
int newkey = 0;
if (key == NULL) {
key = cu->key = BKE_key_add((ID *)cu);
key = cu->key = BKE_key_add(bmain, (ID *)cu);
key->type = KEY_RELATIVE;
newkey = 1;
}
@@ -3079,16 +3079,16 @@ static KeyBlock *insert_curvekey(Object *ob, const char *name, const bool from_m
return kb;
}
KeyBlock *BKE_object_shapekey_insert(Object *ob, const char *name, const bool from_mix)
KeyBlock *BKE_object_shapekey_insert(Main *bmain, Object *ob, const char *name, const bool from_mix)
{
switch (ob->type) {
case OB_MESH:
return insert_meshkey(ob, name, from_mix);
return insert_meshkey(bmain, ob, name, from_mix);
case OB_CURVE:
case OB_SURF:
return insert_curvekey(ob, name, from_mix);
return insert_curvekey(bmain, ob, name, from_mix);
case OB_LATTICE:
return insert_lattkey(ob, name, from_mix);
return insert_lattkey(bmain, ob, name, from_mix);
default:
return NULL;
}