[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55919] trunk/blender/source/blender/ editors/object/object_add.c: BGE: Non-mesh objects (lamps, empties, group instances, etc.) are now "No Collision" by default.

[Mitchell Stokes]

Revision: 55919
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55919
Author:   moguri
Date:     2013-04-09 05:02:10 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
BGE: Non-mesh objects (lamps, empties, group instances, etc.) are now "No Collision" by default.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2013-04-09 01:43:39 UTC (rev 55918)
+++ trunk/blender/source/blender/editors/object/object_add.c	2013-04-09 05:02:10 UTC (rev 55919)
@@ -384,6 +384,12 @@
 	/* more editor stuff */
 	ED_object_base_init_transform(C, BASACT, loc, rot);
 
+	/* Ignore collisions by default for non-mesh objects */
+	if (type != OB_MESH) {
+		ob->body_type = OB_BODY_TYPE_NO_COLLISION;
+		ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_OCCLUDER | OB_DYNAMIC | OB_NAVMESH); /* copied from rna_object.c */
+	}
+
 	DAG_id_type_tag(bmain, ID_OB);
 	DAG_relations_tag_update(bmain);
 	if (ob->data) {