[Bf-blender-cvs] [7f38e598100] blender2.8: Start bringing back particle edit

Mai Lavelle noreply at git.blender.org
Thu Feb 15 09:37:44 CET 2018


Commit: 7f38e598100b93db01e1e80566c449a890f6f171
Author: Mai Lavelle
Date:   Wed Feb 7 22:18:38 2018 -0500
Branches: blender2.8
https://developer.blender.org/rB7f38e598100b93db01e1e80566c449a890f6f171

Start bringing back particle edit

Its kind of broken, but have to start somewhere

===================================================================

M	source/blender/editors/physics/particle_edit.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list