svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2009-jaguarandi

1 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 4de9ff3b6d9..4f72ca96f5f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -400,6 +400,10 @@ Scene *add_scene(char *name)
 
 	sce->toolsettings->proportional_size = 1.0f;
 
+	sce->physics_settings.gravity[0] = 0.0f;
+	sce->physics_settings.gravity[1] = 0.0f;
+	sce->physics_settings.gravity[2] = -9.81f;
+	sce->physics_settings.flag = PHYS_GLOBAL_GRAVITY;
 
 	sce->unit.scale_length = 1.0f;
 
@@ -778,11 +782,11 @@ static void scene_update(Scene *sce, unsigned int lay)
 	DAG_scene_update_flags(sce, lay);   // only stuff that moves or needs display still
 	
 	/* All 'standard' (i.e. without any dependencies) animation is handled here,
-		* with an 'local' to 'macro' order of evaluation. This should ensure that
-		* settings stored nestled within a hierarchy (i.e. settings in a Texture block
-	    * can be overridden by settings from Scene, which owns the Texture through a hierarchy 
-	    * such as Scene->World->MTex/Texture) can still get correctly overridden.
-		*/
+	 * with an 'local' to 'macro' order of evaluation. This should ensure that
+	 * settings stored nestled within a hierarchy (i.e. settings in a Texture block
+	 * can be overridden by settings from Scene, which owns the Texture through a hierarchy 
+	 * such as Scene->World->MTex/Texture) can still get correctly overridden.
+	 */
 	BKE_animsys_evaluate_all_animation(G.main, ctime);
 	
 	for(base= sce->base.first; base; base= base->next) {