[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37001] branches/soc-2010-jwilkins: Merged with trunk: 36994-37000

Jason Wilkins Jason.A.Wilkins at gmail.com
Sun May 29 16:26:36 CEST 2011


Revision: 37001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37001
Author:   jwilkins
Date:     2011-05-29 14:26:35 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Merged with trunk: 36994-37000
This should be last revision before moving to soc-2011-onion, good-bye soc-2010-jwilkins, it's been fun :)

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-jwilkins/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp

Property Changed:
----------------
    branches/soc-2010-jwilkins/
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_particle.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_physics.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_render.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_transform.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-jwilkins/source/blender/editors/render/
    branches/soc-2010-jwilkins/source/blender/editors/render/render_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_update.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c


Property changes on: branches/soc-2010-jwilkins
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:28500-36950
   + /trunk/blender:28500-36950,36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/modules/bpy/ops.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/modules/bpy/utils.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/chicken.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/cream.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/ketchup.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/marble.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/potato.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/skim_milk.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/skin1.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/presets/sss/skin2.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/datafiles/startup.blend.c:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/include/ED_particle.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/include/ED_particle.h:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/include/ED_physics.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/include/ED_physics.h:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/include/ED_render.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/include/ED_render.h:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/include/ED_transform.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/include/ED_transform.h:36994-37000


Property changes on: branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/blender/source/blender/editors/interface/interface_intern.h:36994-37000



@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list