Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMai Lavelle <mai.lavelle@gmail.com>2018-02-08 06:18:38 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2018-02-15 11:26:59 +0300
commit7f38e598100b93db01e1e80566c449a890f6f171 (patch)
tree41e6c0a706e567073bc41ef840af7c9939ae6d54 /source/blender/editors/physics
parentc98af0faaf0d2dc87e9c0007e6fab8f44c2ba608 (diff)
Start bringing back particle edit
Its kind of broken, but have to start somewhere
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index c78f1eaebd0..c0498f6ab19 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -315,7 +315,7 @@ PTCacheEdit *PE_get_current(Scene *scene, ViewLayer *view_layer, Object *ob)
PTCacheEdit *PE_create_current(const EvaluationContext *eval_ctx, Scene *scene, Object *ob)
{
- return pe_get_current(eval_ctx, scene, NULL, ob, 1);
+ return pe_get_current(eval_ctx, scene, eval_ctx->view_layer, ob, 1);
}
void PE_current_changed(const EvaluationContext *eval_ctx, Scene *scene, Object *ob)
@@ -4791,9 +4791,6 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
const int mode_flag = OB_MODE_PARTICLE_EDIT;
const bool is_mode_set = (eval_ctx.object_mode & mode_flag) != 0;
- BKE_report(op->reports, RPT_INFO, "Particles are changing, editing is not possible");
- return OPERATOR_CANCELLED;
-
if (!is_mode_set) {
if (!ED_object_mode_compat_set(C, workspace, mode_flag, op->reports)) {
return OPERATOR_CANCELLED;