diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:37:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:37:15 +0300 |
| commit | b809340960693a3e9808e59de4d1e029226fb492 (patch) | |
| tree | a2f75c291b8ac4d3ffa4abdb3b9fe013f1506dc4 /source/blender/blenkernel/BKE_modifier.h | |
| parent | 3248ac5e83307d623b18ccaed4c0b496121802e5 (diff) | |
| parent | b53d358261a26652d510d62565f1b43035a55e67 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/makesrna/intern/rna_particle.c
source/blender/modifiers/intern/MOD_particlesystem.c
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index a7b491527f5..b5d3e67b970 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -467,7 +467,7 @@ void test_object_modifiers(struct Object *ob); void modifier_mdef_compact_influences(struct ModifierData *md); void modifier_path_init(char *path, int path_maxlen, const char *name); -const char *modifier_path_relbase(struct Object *ob); +const char *modifier_path_relbase(struct Main *bmain, struct Object *ob); /* wrappers for modifier callbacks that ensure valid normals */ |