diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/physics | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_boids.c | 1 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 1 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 1 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_ops.c | 3 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 57b22991f94..ac031079434 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -370,4 +370,3 @@ void BOID_OT_state_move_down(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } - diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 6e3f90588bc..f4777eea999 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -5003,4 +5003,3 @@ void PARTICLE_OT_unify_length(struct wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } - diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 904e4242ed1..6cc9b9b8e4d 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -1125,4 +1125,3 @@ void FLUID_OT_bake(wmOperatorType *ot) ot->exec = fluid_bake_exec; ot->poll = ED_operator_object_active_editable; } - diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index ffa73b41bd9..26002e075cf 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -228,6 +228,3 @@ void ED_keymap_physics(wmKeyConfig *keyconf) keymap_particle(keyconf); //keymap_pointcache(keyconf); } - - - diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 343804726bf..c103a2ed8fb 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -440,4 +440,3 @@ void PTCACHE_OT_remove(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; } - |