merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge

1 files changed, 17 insertions, 15 deletions

diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 38ee11954e9..f590339b91d 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.
@@ -44,6 +44,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_cdderivedmesh.h"
+#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
@@ -81,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;
@@ -119,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;
@@ -178,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;
@@ -226,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;
@@ -274,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;
@@ -314,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;
 	
@@ -352,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;
 	
@@ -390,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;
 	
@@ -430,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;
@@ -473,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;
@@ -512,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;
 	
@@ -596,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;
@@ -654,7 +655,8 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
 		BLI_bvhtree_find_nearest(bvhtree.tree, key->co, &nearest, bvhtree.nearest_callback, &bvhtree);
 
 		if(nearest.index == -1) {
-			printf("No nearest point found for hair root!");
+			if (G.f & G_DEBUG)
+				printf("No nearest point found for hair root!");
 			continue;
 		}
 
@@ -734,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;