diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-31 12:47:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-31 12:47:43 +0300 |
| commit | 3e9ade6e31c395252189e077b8edd0c846799694 (patch) | |
| tree | 4eaad80cb0b61e819879c9cae41b714fe4d0e161 /source/blender/modifiers/intern/MOD_screw.c | |
| parent | 85174329d9f5701ed1499d7205dd153ec81d0e00 (diff) | |
| parent | b5682a6fdd8a3ebbea1fd4a75c72fe8c9c3326c5 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library_query.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_screw.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index a834d1b5cae..1273a3a6e09 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -1075,7 +1075,7 @@ static void foreachObjectLink( { ScrewModifierData *ltmd = (ScrewModifierData *) md; - walk(userData, ob, <md->ob_axis, IDWALK_NOP); + walk(userData, ob, <md->ob_axis, IDWALK_CB_NOP); } ModifierTypeInfo modifierType_Screw = { |