[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39832] branches/bmesh/blender: svn merge -r39830:39831 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Campbell Barton]

Revision: 39832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39832
Author:   campbellbarton
Date:     2011-09-01 01:28:45 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
svn merge -r39830:39831 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39830

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/render/render_update.c
    branches/bmesh/blender/source/blender/editors/space_outliner/
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-39829
   + /trunk/blender:31524-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39831


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39829
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39831


Property changes on: branches/bmesh/blender/source/blender/editors/render/render_update.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/source/blender/editors/render/render_update.c:36801-39829
   + /trunk/blender/source/blender/editors/render/render_update.c:36801-39831


Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-39829
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-39831


Property changes on: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c:36530-39829
   + /trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c:36530-39831

Modified: branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/bmesh/blender/source/blender/render/intern/source/pipeline.c	2011-09-01 01:13:50 UTC (rev 39831)
+++ branches/bmesh/blender/source/blender/render/intern/source/pipeline.c	2011-09-01 01:28:45 UTC (rev 39832)
@@ -174,7 +174,7 @@
 			fprintf(stdout, "Sce: %s Ve:%d Fa:%d La:%d", rs->scenename, rs->totvert, rs->totface, rs->totlamp);
 	}
 
-	BLI_exec_cb(rs, (ID *)rs, BLI_CB_EVT_RENDER_STATS);
+	BLI_exec_cb(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
 
 	fputc('\n', stdout);
 	fflush(stdout);