diff options
author | Matt Ebb <matt@mke3.net> | 2009-12-04 09:33:01 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-12-04 09:33:01 +0300 |
commit | e299798bbf71959b372fd12c0567bad3ed8c116a (patch) | |
tree | cd7359182f2656efde81f77babf1e682a03d2fc3 /source/blender/editors/physics | |
parent | d828062f1b4e14f1457978da57fda5be7d86e60a (diff) |
Fix for [#20203] Linked objects - A few bugs
Did a lot of cleaning Object operator poll functions to check if the object's linked
or not. For this, added the function ED_operator_object_active_editable() as
opposed to ED_operator_object_active()
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 5 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index ce740a53db8..f94835593c5 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -56,6 +56,7 @@ #include "WM_types.h" #include "ED_particle.h" +#include "ED_screen.h" #include "physics_intern.h" @@ -83,8 +84,9 @@ void OBJECT_OT_particle_system_add(wmOperatorType *ot) ot->description="Add a particle system."; /* api callbacks */ + ot->poll= ED_operator_object_active_editable; ot->exec= particle_system_add_exec; - + /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } @@ -120,6 +122,7 @@ void OBJECT_OT_particle_system_remove(wmOperatorType *ot) ot->description="Remove the selected particle system."; /* api callbacks */ + ot->poll= ED_operator_object_active_editable; ot->exec= particle_system_remove_exec; /* flags */ diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index e5d553dacc7..7893b314e3e 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -1200,6 +1200,6 @@ void FLUID_OT_bake(wmOperatorType *ot) /* api callbacks */ ot->exec= fluid_bake_exec; - ot->poll= ED_operator_object_active; + ot->poll= ED_operator_object_active_editable; } |