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

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/library_query.c
This commit is contained in:
Bastien Montagne
2017-01-31 10:47:43 +01:00
parent 85174329d9 b5682a6fdd
commit 3e9ade6e31
85 changed files with 1447 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -88,7 +88,7 @@ static void foreachObjectLink(
{
LatticeModifierData *lmd = (LatticeModifierData *) md;
walk(userData, ob, &lmd->object, IDWALK_NOP);
walk(userData, ob, &lmd->object, IDWALK_CB_NOP);
}
static void updateDepsgraph(ModifierData *md,