diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:06:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:14:05 +0300 |
| commit | 5e81d993afadc6b5d37410e91998395caf1d1281 (patch) | |
| tree | ec57394bb9e74110a21b086678535e17c65524db /source/blender/makesrna/intern/rna_object.c | |
| parent | b5bf3011bf3851d1e68dbcdde310fff04dc3f2f5 (diff) | |
| parent | a3486e735f7e5af6ca78dafc8608cced5a121096 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 12140e3a8ed..aa78b9e614d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -45,6 +45,7 @@ #include "BKE_camera.h" #include "BKE_paint.h" +#include "BKE_editlattice.h" #include "BKE_editmesh.h" #include "BKE_group.h" /* needed for BKE_group_object_exists() */ #include "BKE_object_deform.h" @@ -325,8 +326,8 @@ static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) ED_curve_editnurb_make(ob); break; case OB_LATTICE: - ED_lattice_editlatt_load(ob); - ED_lattice_editlatt_make(ob); + BKE_editlattice_load(ob); + BKE_editlattice_make(ob); break; } } |