diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
| commit | 8cff9c20fff954cb0aa725c15c064c3aecf322b5 (patch) | |
| tree | 99bd6e859bcfbe56f555bfe2d1e4eae374fdf1c3 /source/blender/editors/physics/physics_ops.c | |
| parent | 628ef78e8a9db7ba37cfc1bbb6b2d4ac0dbecab3 (diff) | |
| parent | b23ffded0866b5b24cb50fca669efde4ec1e3ffd (diff) | |
Merge branch 'master' into blender2.8
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff.
Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway).
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_view3d/drawvolume.c
source/blender/makesrna/intern/rna_smoke.c
Diffstat (limited to 'source/blender/editors/physics/physics_ops.c')
| -rw-r--r-- | source/blender/editors/physics/physics_ops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index 357259731d2..d0cb7fd12a9 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -91,3 +91,6 @@ void ED_operatortypes_physics(void) void ED_keymap_physics(wmKeyConfig *UNUSED(keyconf)) { } + + + |