[Bf-blender-cvs] [38673621a44] master: Missed last commit
Campbell Barton
noreply at git.blender.org
Wed Mar 6 14:18:24 CET 2019
Commit: 38673621a44cc8f321aee7dc7ec203adb65e0029
Author: Campbell Barton
Date: Thu Mar 7 00:17:54 2019 +1100
Branches: master
https://developer.blender.org/rB38673621a44cc8f321aee7dc7ec203adb65e0029
Missed last commit
===================================================================
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 a3173136783..0c08fc6fb29 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2915,10 +2915,6 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
ParticleEditSettings *pset = PE_settings(scene);
ParticleBrushData *brush;
- if (pset->brushtype < 0) {
- return;
- }
-
if (!WM_toolsystem_active_tool_is_brush(C)) {
return;
}
@@ -4082,16 +4078,11 @@ static int brush_edit_init(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Object *ob = CTX_data_active_object(C);
- ParticleEditSettings *pset = PE_settings(scene);
PTCacheEdit *edit = PE_get_current(scene, ob);
ARegion *ar = CTX_wm_region(C);
BrushEdit *bedit;
float min[3], max[3];
- if (pset->brushtype < 0) {
- return 0;
- }
-
if (!WM_toolsystem_active_tool_is_brush(C)) {
return 0;
}
More information about the Bf-blender-cvs
mailing list