diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
| commit | 43eebdfebd6e31d188ae3c1b220c8991fc869df3 (patch) | |
| tree | 5adc929ce792f2dfd74276838e63d91fcddb9a1c /source/blender/collada/ArmatureImporter.h | |
| parent | c98b2e74df2e531726f5ceabe76342282f695f23 (diff) | |
| parent | be57cf9b2a0e1be577211839487cacd288886c1a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index b13e40bf855..58121a090fa 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -146,7 +146,7 @@ public: // here we add bones to armatures, having armatures previously created in write_controller void make_armatures(bContext *C, std::vector<Object *> &objects_to_scale); - void make_shape_keys(); + void make_shape_keys(bContext *C); #if 0 // link with meshes, create vertex groups, assign weights |