diff options
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_boids.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 28 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 2 |
7 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 50a1bffbf30..e738aa34d07 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Janne Karhu. * All rights reserved. @@ -87,7 +87,7 @@ void BOID_OT_rule_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Boid Rule"; - ot->description = "Add a boid rule to the current boid state."; + ot->description = "Add a boid rule to the current boid state"; ot->idname= "BOID_OT_rule_add"; /* api callbacks */ @@ -178,7 +178,7 @@ static int rule_move_up_exec(bContext *C, wmOperator *op) void BOID_OT_rule_move_up(wmOperatorType *ot) { ot->name= "Move Up Boid Rule"; - ot->description= "Move boid rule up in the list."; + ot->description= "Move boid rule up in the list"; ot->idname= "BOID_OT_rule_move_up"; ot->exec= rule_move_up_exec; @@ -216,7 +216,7 @@ static int rule_move_down_exec(bContext *C, wmOperator *op) void BOID_OT_rule_move_down(wmOperatorType *ot) { ot->name= "Move Down Boid Rule"; - ot->description= "Move boid rule down in the list."; + ot->description= "Move boid rule down in the list"; ot->idname= "BOID_OT_rule_move_down"; ot->exec= rule_move_down_exec; @@ -257,7 +257,7 @@ void BOID_OT_state_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Boid State"; - ot->description = "Add a boid state to the particle system."; + ot->description = "Add a boid state to the particle system"; ot->idname= "BOID_OT_state_add"; /* api callbacks */ @@ -349,7 +349,7 @@ static int state_move_up_exec(bContext *C, wmOperator *op) void BOID_OT_state_move_up(wmOperatorType *ot) { ot->name= "Move Up Boid State"; - ot->description= "Move boid state up in the list."; + ot->description= "Move boid state up in the list"; ot->idname= "BOID_OT_state_move_up"; ot->exec= state_move_up_exec; @@ -385,7 +385,7 @@ static int state_move_down_exec(bContext *C, wmOperator *op) void BOID_OT_state_move_down(wmOperatorType *ot) { ot->name= "Move Down Boid State"; - ot->description= "Move boid state down in the list."; + ot->description= "Move boid state down in the list"; ot->idname= "BOID_OT_state_move_down"; ot->exec= state_move_down_exec; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index c2ead76ff3e..9fc9131ffb2 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 by Janne Karhu. * All rights reserved. @@ -191,7 +191,7 @@ int PE_start_edit(PTCacheEdit *edit) ParticleEditSettings *PE_settings(Scene *scene) { - return &scene->toolsettings->particle; + return scene->toolsettings ? &scene->toolsettings->particle : NULL; } /* always gets atleast the first particlesystem even if PSYS_CURRENT flag is not set @@ -205,12 +205,12 @@ static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create) ListBase pidlist; PTCacheID *pid; + if(pset==NULL || ob==NULL) + return NULL; + pset->scene = scene; pset->object = ob; - if(ob==NULL) - return NULL; - BKE_ptcache_ids_from_object(&pidlist, ob); /* in the case of only one editable thing, set pset->edittype accordingly */ diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index e567c940546..d72357a38b1 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. @@ -82,7 +82,7 @@ void OBJECT_OT_particle_system_add(wmOperatorType *ot) /* identifiers */ ot->name= "Add Particle System Slot"; ot->idname= "OBJECT_OT_particle_system_add"; - ot->description="Add a particle system."; + ot->description="Add a particle system"; /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -120,7 +120,7 @@ void OBJECT_OT_particle_system_remove(wmOperatorType *ot) /* identifiers */ ot->name= "Remove Particle System Slot"; ot->idname= "OBJECT_OT_particle_system_remove"; - ot->description="Remove the selected particle system."; + ot->description="Remove the selected particle system"; /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -179,7 +179,7 @@ void PARTICLE_OT_new(wmOperatorType *ot) /* identifiers */ ot->name= "New Particle Settings"; ot->idname= "PARTICLE_OT_new"; - ot->description="Add new particle settings."; + ot->description="Add new particle settings"; /* api callbacks */ ot->exec= new_particle_settings_exec; @@ -227,7 +227,7 @@ void PARTICLE_OT_new_target(wmOperatorType *ot) /* identifiers */ ot->name= "New Particle Target"; ot->idname= "PARTICLE_OT_new_target"; - ot->description="Add a new particle target."; + ot->description="Add a new particle target"; /* api callbacks */ ot->exec= new_particle_target_exec; @@ -275,7 +275,7 @@ void PARTICLE_OT_target_remove(wmOperatorType *ot) /* identifiers */ ot->name= "Remove Particle Target"; ot->idname= "PARTICLE_OT_target_remove"; - ot->description="Remove the selected particle target."; + ot->description="Remove the selected particle target"; /* api callbacks */ ot->exec= remove_particle_target_exec; @@ -315,7 +315,7 @@ void PARTICLE_OT_target_move_up(wmOperatorType *ot) { ot->name= "Move Up Target"; ot->idname= "PARTICLE_OT_target_move_up"; - ot->description= "Move particle target up in the list."; + ot->description= "Move particle target up in the list"; ot->exec= target_move_up_exec; @@ -353,7 +353,7 @@ void PARTICLE_OT_target_move_down(wmOperatorType *ot) { ot->name= "Move Down Target"; ot->idname= "PARTICLE_OT_target_move_down"; - ot->description= "Move particle target down in the list."; + ot->description= "Move particle target down in the list"; ot->exec= target_move_down_exec; @@ -391,7 +391,7 @@ void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot) { ot->name= "Move Up Dupli Object"; ot->idname= "PARTICLE_OT_dupliob_move_up"; - ot->description= "Move dupli object up in the list."; + ot->description= "Move dupli object up in the list"; ot->exec= dupliob_move_up_exec; @@ -431,7 +431,7 @@ void PARTICLE_OT_dupliob_copy(wmOperatorType *ot) /* identifiers */ ot->name= "Copy Particle Dupliob"; ot->idname= "PARTICLE_OT_dupliob_copy"; - ot->description="Duplicate the current dupliobject."; + ot->description="Duplicate the current dupliobject"; /* api callbacks */ ot->exec= copy_particle_dupliob_exec; @@ -474,7 +474,7 @@ void PARTICLE_OT_dupliob_remove(wmOperatorType *ot) /* identifiers */ ot->name= "Remove Particle Dupliobject"; ot->idname= "PARTICLE_OT_dupliob_remove"; - ot->description="Remove the selected dupliobject."; + ot->description="Remove the selected dupliobject"; /* api callbacks */ ot->exec= remove_particle_dupliob_exec; @@ -513,7 +513,7 @@ void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) { ot->name= "Move Down Dupli Object"; ot->idname= "PARTICLE_OT_dupliob_move_down"; - ot->description= "Move dupli object down in the list."; + ot->description= "Move dupli object down in the list"; ot->exec= dupliob_move_down_exec; @@ -597,7 +597,7 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_disconnect_hair(wmOperatorType *ot) { ot->name= "Disconnect Hair"; - ot->description= "Disconnect hair from the emitter mesh."; + ot->description= "Disconnect hair from the emitter mesh"; ot->idname= "PARTICLE_OT_disconnect_hair"; ot->exec= disconnect_hair_exec; @@ -736,7 +736,7 @@ static int connect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_connect_hair(wmOperatorType *ot) { ot->name= "Connect Hair"; - ot->description= "Connect hair to the emitter mesh."; + ot->description= "Connect hair to the emitter mesh"; ot->idname= "PARTICLE_OT_connect_hair"; ot->exec= connect_hair_exec; diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index b1a3a3be28d..65701f89c4e 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) Blender Foundation * All rights reserved. @@ -1217,7 +1217,7 @@ void FLUID_OT_bake(wmOperatorType *ot) { /* identifiers */ ot->name= "Fluid Simulation Bake"; - ot->description= "Bake fluid simulation."; + ot->description= "Bake fluid simulation"; ot->idname= "FLUID_OT_bake"; /* api callbacks */ diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index 3de5c256df7..aa3a2e22e31 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 by Janne Karhu. * All rights reserved. diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index 2728f64a777..55568c89e75 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 0cd4c2e6ce8..1359af5377f 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 by Janne Karhu. * All rights reserved. |