diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/editors/physics/physics_ops.c | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/editors/physics/physics_ops.c')
| -rw-r--r-- | source/blender/editors/physics/physics_ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index ef278179774..4d78e745606 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -69,6 +69,8 @@ static void operatortypes_particle(void) WM_operatortype_append(PARTICLE_OT_particle_edit_toggle); WM_operatortype_append(PARTICLE_OT_edited_clear); + WM_operatortype_append(PARTICLE_OT_shape_propagate_to_all); + WM_operatortype_append(OBJECT_OT_particle_system_add); WM_operatortype_append(OBJECT_OT_particle_system_remove); |