[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37070] branches/soc-2011-onion: svn property fixes.

[Jason Wilkins]

Revision: 37070
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37070
Author:   jwilkins
Date:     2011-06-01 08:28:41 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
svn property fixes.
These are all empty svn:mergeinfo tags that should probably be cleaned up in trunk, but I'm adding them back in our branch so that diffs come out clean.

Property Changed:
----------------
    branches/soc-2011-onion/release/scripts/modules/bpy/ops.py
    branches/soc-2011-onion/release/scripts/modules/bpy/utils.py
    branches/soc-2011-onion/release/scripts/presets/sss/chicken.py
    branches/soc-2011-onion/release/scripts/presets/sss/cream.py
    branches/soc-2011-onion/release/scripts/presets/sss/ketchup.py
    branches/soc-2011-onion/release/scripts/presets/sss/marble.py
    branches/soc-2011-onion/release/scripts/presets/sss/potato.py
    branches/soc-2011-onion/release/scripts/presets/sss/skim_milk.py
    branches/soc-2011-onion/release/scripts/presets/sss/skin1.py
    branches/soc-2011-onion/release/scripts/presets/sss/skin2.py
    branches/soc-2011-onion/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2011-onion/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-onion/source/blender/blenkernel/BKE_customdata_file.h
    branches/soc-2011-onion/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2011-onion/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2011-onion/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-onion/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-onion/source/blender/editors/object/object_add.c
    branches/soc-2011-onion/source/blender/editors/object/object_constraint.c
    branches/soc-2011-onion/source/blender/editors/object/object_group.c
    branches/soc-2011-onion/source/blender/editors/object/object_hook.c
    branches/soc-2011-onion/source/blender/editors/object/object_lattice.c
    branches/soc-2011-onion/source/blender/editors/object/object_relations.c
    branches/soc-2011-onion/source/blender/editors/object/object_select.c
    branches/soc-2011-onion/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-onion/source/blender/editors/object/object_transform.c
    branches/soc-2011-onion/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-onion/source/blender/editors/physics/particle_boids.c
    branches/soc-2011-onion/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-onion/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-onion/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2011-onion/source/blender/editors/render/
    branches/soc-2011-onion/source/blender/editors/render/render_intern.h
    branches/soc-2011-onion/source/blender/editors/render/render_preview.c
    branches/soc-2011-onion/source/blender/editors/render/render_shading.c
    branches/soc-2011-onion/source/blender/editors/render/render_update.c
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-onion/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-onion/source/blender/editors/space_node/node_state.c
    branches/soc-2011-onion/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-onion/source/blender/editors/space_userpref/
    branches/soc-2011-onion/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2011-onion/source/blender/editors/space_userpref/userpref_intern.h
    branches/soc-2011-onion/source/blender/editors/space_userpref/userpref_ops.c
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-onion/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-onion/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2011-onion/source/blender/makesrna/intern/rna_sculpt_paint.c


Property changes on: branches/soc-2011-onion/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/chicken.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/cream.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/ketchup.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/marble.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/potato.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/skim_milk.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/skin1.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/presets/sss/skin2.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/blenkernel/BKE_customdata_file.h
___________________________________________________________________
Added: svn:merginfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/blenkernel/intern/customdata_file.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/datafiles/startup.blend.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/interface/interface_intern.h
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/metaball/mball_edit.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_add.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_constraint.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_group.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_hook.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_lattice.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_relations.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_select.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_shapekey.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_transform.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/object/object_vgroup.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/physics/particle_boids.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/physics/particle_edit.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/physics/physics_fluid.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/physics/physics_pointcache.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/render
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/render/render_intern.h
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/render/render_preview.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/render/render_shading.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/render/render_update.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/sculpt_paint
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c

@@ Diff output truncated at 10240 characters. @@