[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40026] branches/bmesh/blender: svn merge -r39986:39990 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Campbell Barton]

Revision: 40026
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40026
Author:   campbellbarton
Date:     2011-09-08 04:45:39 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
svn merge -r39986:39990 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.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-39986
   + /trunk/blender:31524-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39990


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-39986
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39990


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-39986
   + /trunk/blender/source/blender/editors/render/render_update.c:36801-39990


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-39986
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-39990


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-39986
   + /trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c:36530-39990

Modified: branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_value.c
===================================================================
--- branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_value.c	2011-09-08 04:43:56 UTC (rev 40025)
+++ branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_value.c	2011-09-08 04:45:39 UTC (rev 40026)
@@ -46,6 +46,8 @@
 	bNodeSocketValueFloat *dval= (bNodeSocketValueFloat*)sock->default_value;
 	/* uses the default value of the output socket, must be initialized here */
 	dval->value = 0.5f;
+	dval->min = -FLT_MAX;
+	dval->max = FLT_MAX;
 }
 
 static void node_composit_exec_value(void *UNUSED(data), bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)

Modified: branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.c
===================================================================
--- branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.c	2011-09-08 04:43:56 UTC (rev 40025)
+++ branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.c	2011-09-08 04:45:39 UTC (rev 40026)
@@ -46,6 +46,8 @@
 	bNodeSocketValueFloat *dval= (bNodeSocketValueFloat*)sock->default_value;
 	/* uses the default value of the output socket, must be initialized here */
 	dval->value = 0.5f;
+	dval->min = -FLT_MAX;

@@ Diff output truncated at 10240 characters. @@