[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23251] branches/soc-2009-jaguarandi/ source/blender: svn merge -r 22571:22800 https://svn.blender.org/svnroot/ bf-blender/trunk/blender
Andre Susano Pinto
andresusanopinto at gmail.com
Tue Sep 15 17:15:44 CEST 2009
Revision: 23251
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23251
Author: jaguarandi
Date: 2009-09-15 17:15:43 +0200 (Tue, 15 Sep 2009)
Log Message:
-----------
svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 22800:23207 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merged volumetric with new raytrace code (it compiles and rendered volume-cube.blend withouth problems)
Part1:
source/blender
Modified Paths:
--------------
branches/soc-2009-jaguarandi/source/blender/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/avi/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/avi/SConscript
branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h
branches/soc-2009-jaguarandi/source/blender/blenfont/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenfont/SConscript
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_internal.h
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_action.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_anim.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_animsys.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_armature.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_blender.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_brush.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_cloth.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_constraint.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_context.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_curve.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_global.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_group.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_key.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_library.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_modifier.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_multires.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_node.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_object.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_paint.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sca.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_scene.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_smoke.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sound.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_text.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_texture.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenkernel/SConscript
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/Makefile
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/action.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/armature.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/blender.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/boids.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/booleanops.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/brush.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cloth.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/collision.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/colortools.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/constraint.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/context.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/curve.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/displist.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/font.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/gpencil.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/group.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/idprop.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/image.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/implicit.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/key.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/lattice.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/library.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/material.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/mesh.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/multires.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/nla.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/node.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/packedFile.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/paint.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sca.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/scene.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sound.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/text.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/texture.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/unit.c
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_arithb.h
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_fileops.h
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_winstuff.h
branches/soc-2009-jaguarandi/source/blender/blenlib/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenlib/SConscript
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/arithb.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/bpath.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/fileops.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/freetypefont.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/storage.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/threads.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/util.c
branches/soc-2009-jaguarandi/source/blender/blenloader/BLO_readfile.h
branches/soc-2009-jaguarandi/source/blender/blenloader/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenloader/SConscript
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readblenentry.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.h
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2009-jaguarandi/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/blenpluginapi/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/editors/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_deps.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_filter.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/drivers.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyframes_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyframes_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyframes_general.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyframing.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/keyingsets.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_generate.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/meshlaplacian.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/poselib.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/poseobject.c
branches/soc-2009-jaguarandi/source/blender/editors/curve/curve_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/curve/editcurve.c
branches/soc-2009-jaguarandi/source/blender/editors/curve/editfont.c
branches/soc-2009-jaguarandi/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-jaguarandi/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/gpencil_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_armature.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_gpencil.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_mball.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_mesh.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_node.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_object.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_particle.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_screen.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_space_api.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_view3d.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_icons.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_anim.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_icons.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_layout.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_panel.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_regions.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_templates.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_utils.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/resources.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_layers.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/meshtools.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/object/object_modifier.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_vgroup.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_fluidsim.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/editparticle.c
branches/soc-2009-jaguarandi/source/blender/editors/preview/previewrender.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/editors/screen/area.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_context.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screendump.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/space_action.c
branches/soc-2009-jaguarandi/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_console/console_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_console/console_report.c
branches/soc-2009-jaguarandi/source/blender/editors/space_console/space_console.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_panels.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filelist.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filelist.h
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filesel.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/space_file.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/space_image.c
branches/soc-2009-jaguarandi/source/blender/editors/space_info/info_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_info/info_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_info/space_info.c
branches/soc-2009-jaguarandi/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-jaguarandi/source/blender/editors/space_logic/space_logic.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_channels.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/drawnode.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_state.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/space_node.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-jaguarandi/source/blender/editors/space_script/script_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_script/script_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2009-jaguarandi/source/blender/editors/space_text/space_text.c
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_time/space_time.c
branches/soc-2009-jaguarandi/source/blender/editors/space_time/time_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.h
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_generics.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-jaguarandi/source/blender/editors/util/editmode_undo.c
branches/soc-2009-jaguarandi/source/blender/editors/util/undo.c
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-jaguarandi/source/blender/gpu/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/gpu/GPU_draw.h
branches/soc-2009-jaguarandi/source/blender/gpu/GPU_extensions.h
branches/soc-2009-jaguarandi/source/blender/gpu/SConscript
branches/soc-2009-jaguarandi/source/blender/gpu/intern/Makefile
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2009-jaguarandi/source/blender/gpu/intern/gpu_material.c
branches/soc-2009-jaguarandi/source/blender/imbuf/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/imbuf/SConscript
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/anim.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/anim5.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/cineon/SConscript
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/dds/SConscript
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/hamx.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/iff.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/jp2.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/openexr/Makefile
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/openexr/SConscript
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/thumbs.c
branches/soc-2009-jaguarandi/source/blender/imbuf/intern/writeimage.c
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_action_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_brush_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_curve_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_sound_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_texture_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/SConscript
branches/soc-2009-jaguarandi/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/makesdna/intern/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_access.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_define.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/Makefile
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/SConscript
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_action.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_animation.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_boid.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_group.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_main.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_meta.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_nla.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_packedfile.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_render.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sound.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-jaguarandi/source/blender/nodes/CMP_node.h
branches/soc-2009-jaguarandi/source/blender/nodes/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/nodes/SConscript
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_util.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_util.h
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_at.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_util.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/TEX_util.h
branches/soc-2009-jaguarandi/source/blender/python/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/python/SConscript
branches/soc-2009-jaguarandi/source/blender/python/epy_doc_gen.py
branches/soc-2009-jaguarandi/source/blender/python/generic/Geometry.c
branches/soc-2009-jaguarandi/source/blender/python/generic/Mathutils.c
branches/soc-2009-jaguarandi/source/blender/python/generic/bpy_internal_import.h
branches/soc-2009-jaguarandi/source/blender/python/generic/matrix.c
branches/soc-2009-jaguarandi/source/blender/python/generic/vector.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_interface.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.h
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.h
branches/soc-2009-jaguarandi/source/blender/quicktime/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/quicktime/SConscript
branches/soc-2009-jaguarandi/source/blender/readblenfile/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/readblenfile/SConscript
branches/soc-2009-jaguarandi/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2009-jaguarandi/source/blender/render/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/render/SConscript
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/render_types.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rendercore.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/shading.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/texture.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/Makefile
branches/soc-2009-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/envmap.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/initrender.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/occlusion.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/pixelshading.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rendercore.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadbuf.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeoutput.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/strand.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/texture.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/zbuf.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/windowmanager/WM_api.h
branches/soc-2009-jaguarandi/source/blender/windowmanager/WM_types.h
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/Makefile
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_window.c
Added Paths:
-----------
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_voxel.h
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/voxel.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_info.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_sound.h
branches/soc-2009-jaguarandi/source/blender/editors/mesh/loopcut.c
branches/soc-2009-jaguarandi/source/blender/editors/metaball/mball_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_add.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_constraint.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_group.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_hook.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_lattice.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_relations.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_select.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_shapekey.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_transform.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2009-jaguarandi/source/blender/editors/sound/
branches/soc-2009-jaguarandi/source/blender/editors/sound/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/sound/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/sound/sound_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/sound/sound_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_info/info_stats.c
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/userpref_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_test.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/soc-2009-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_array.c
branches/soc-2009-jaguarandi/source/blender/render/intern/include/pointdensity.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/volume_precache.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/volumetric.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/voxeldata.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/pointdensity.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/volume_precache.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/volumetric.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/voxeldata.c
Removed Paths:
-------------
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sculpt.h
branches/soc-2009-jaguarandi/source/blender/blenlib/MTC_matrixops.h
branches/soc-2009-jaguarandi/source/blender/blenlib/MTC_vectorops.h
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/matrixops.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/vectorops.c
branches/soc-2009-jaguarandi/source/blender/editors/metaball/editmball.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editconstraint.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editgroup.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editkey.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editlattice.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt_stroke.c
branches/soc-2009-jaguarandi/source/blender/editors/sound/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/sound/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/sound/sound_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/sound/sound_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_time/time_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/Makefile
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/SConscript
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_userpref/userpref_ops.c
Modified: branches/soc-2009-jaguarandi/source/blender/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/CMakeLists.txt 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/CMakeLists.txt 2009-09-15 15:15:43 UTC (rev 23251)
@@ -42,18 +42,18 @@
ADD_SUBDIRECTORY(blenfont)
IF(WITH_OPENEXR)
- ADD_SUBDIRECTORY(imbuf/intern/openexr)
+ ADD_SUBDIRECTORY(imbuf/intern/openexr)
ENDIF(WITH_OPENEXR)
IF(WITH_DDS)
- ADD_SUBDIRECTORY(imbuf/intern/dds)
+ ADD_SUBDIRECTORY(imbuf/intern/dds)
ENDIF(WITH_DDS)
IF(WITH_QUICKTIME)
- ADD_SUBDIRECTORY(quicktime)
+ ADD_SUBDIRECTORY(quicktime)
ENDIF(WITH_QUICKTIME)
IF(WITH_PYTHON)
- ADD_SUBDIRECTORY(python)
+ ADD_SUBDIRECTORY(python)
ENDIF(WITH_PYTHON)
Modified: branches/soc-2009-jaguarandi/source/blender/avi/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/avi/CMakeLists.txt 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/avi/CMakeLists.txt 2009-09-15 15:15:43 UTC (rev 23251)
@@ -27,8 +27,8 @@
FILE(GLOB SRC intern/*.c)
SET(INC
- . ../../../intern/guardedalloc
- ${JPEG_INC}
+ . ../../../intern/guardedalloc
+ ${JPEG_INC}
)
BLENDERLIB(bf_avi "${SRC}" "${INC}")
Modified: branches/soc-2009-jaguarandi/source/blender/avi/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/avi/SConscript 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/avi/SConscript 2009-09-15 15:15:43 UTC (rev 23251)
@@ -1,5 +1,4 @@
#!/usr/bin/python
-#Import ('extra_includes')
Import ('env')
sources = env.Glob('intern/*.c')
@@ -7,4 +6,4 @@
incs = '. #/intern/guardedalloc'
incs += ' ' + env['BF_JPEG_INC']
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [185] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [190,120] )
Modified: branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h 2009-09-15 15:15:43 UTC (rev 23251)
@@ -70,6 +70,11 @@
float BLF_width(char *str);
float BLF_height(char *str);
+/*
+ * The following function return the width and height of the string, but
+ * just in one call, so avoid extra freetype2 stuff.
+ */
+void BLF_width_and_height(char *str, float *width, float *height);
/*
* For fixed width fonts only, returns the width of a
@@ -117,6 +122,28 @@
void BLF_shadow_offset(int x, int y);
/*
+ * Set the buffer, size and number of channels to draw, one thing to take care is call
+ * this function with NULL pointer when we finish, for example:
+ * BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4);
+ *
+ * ... set color, position and draw ...
+ *
+ * BLF_buffer(NULL, NULL, 0, 0, 0);
+ */
+void BLF_buffer(float *fbuf, unsigned char *cbuf, unsigned int w, unsigned int h, int nch);
+
+/*
+ * Set the color to be used for text.
+ */
+void BLF_buffer_col(float r, float g, float b, float a);
+
+/*
+ * Draw the string into the buffer, this function draw in both buffer, float and unsigned char _BUT_
+ * it's not necessary set both buffer, NULL is valid here.
+ */
+void BLF_draw_buffer(char *str);
+
+/*
* Search the path directory to the locale files, this try all
* the case for Linux, Win and Mac.
*/
Modified: branches/soc-2009-jaguarandi/source/blender/blenfont/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenfont/CMakeLists.txt 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/blenfont/CMakeLists.txt 2009-09-15 15:15:43 UTC (rev 23251)
@@ -25,17 +25,17 @@
FILE(GLOB SRC intern/*.c)
SET(INC
- ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
- ../blenkernel ../../../extern/glew/include .
- ${FREETYPE_INCLUDE_DIRS}
+ ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
+ ../blenkernel ../../../extern/glew/include .
+ ${FREETYPE_INCLUDE_DIRS}
)
IF(WITH_INTERNATIONAL)
- SET(INC ${INC} ${GETTEXT_INC})
+ SET(INC ${INC} ${GETTEXT_INC})
ENDIF(WITH_INTERNATIONAL)
IF(WIN32)
- ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
+ ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
ENDIF(WIN32)
BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
Modified: branches/soc-2009-jaguarandi/source/blender/blenfont/SConscript
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenfont/SConscript 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/blenfont/SConscript 2009-09-15 15:15:43 UTC (rev 23251)
@@ -14,4 +14,4 @@
if sys.platform == 'win32':
defs += ' _WIN32 USE_GETTEXT_DLL'
-env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] )
+env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[210,210] )
Modified: branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c 2009-09-15 15:15:43 UTC (rev 23251)
@@ -371,6 +371,15 @@
blf_font_boundbox(font, str, box);
}
+void BLF_width_and_height(char *str, float *width, float *height)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font)
+ blf_font_width_and_height(font, str, width, height);
+}
+
float BLF_width(char *str)
{
FontBLF *font;
@@ -513,3 +522,39 @@
font->shadow_y= y;
}
}
+
+void BLF_buffer(float *fbuf, unsigned char *cbuf, unsigned int w, unsigned int h, int nch)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font) {
+ font->b_fbuf= fbuf;
+ font->b_cbuf= cbuf;
+ font->bw= w;
+ font->bh= h;
+ font->bch= nch;
+ }
+}
+
+void BLF_buffer_col(float r, float g, float b, float a)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font) {
+ font->b_col[0]= r;
+ font->b_col[1]= g;
+ font->b_col[2]= b;
+ font->b_col[3]= a;
+ }
+}
+
+void BLF_draw_buffer(char *str)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font)
+ blf_font_buffer(font, str);
+}
Modified: branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c 2009-09-15 15:05:09 UTC (rev 23250)
+++ branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c 2009-09-15 15:15:43 UTC (rev 23251)
@@ -100,7 +100,7 @@
unsigned int c;
GlyphBLF *g, *g_prev;
FT_Vector delta;
- FT_UInt glyph_index, g_prev_index;
+ FT_UInt glyph_index;
int pen_x, pen_y;
int i, has_kerning, st;
@@ -112,17 +112,17 @@
pen_y= 0;
has_kerning= FT_HAS_KERNING(font->face);
g_prev= NULL;
- g_prev_index= 0;
while (str[i]) {
c= blf_utf8_next((unsigned char *)str, &i);
if (c == 0)
break;
- glyph_index= FT_Get_Char_Index(font->face, c);
g= blf_glyph_search(font->glyph_cache, c);
- if (!g)
+ if (!g) {
+ glyph_index= FT_Get_Char_Index(font->face, c);
g= blf_glyph_add(font, glyph_index, c);
+ }
/* if we don't found a glyph, skip it. */
if (!g)
@@ -133,9 +133,9 @@
delta.y= 0;
if (font->flags & BLF_KERNING_DEFAULT)
- st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, ft_kerning_default, &delta);
+ st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, ft_kerning_default, &delta);
else
- st= FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta);
+ st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, FT_KERNING_UNFITTED, &delta);
if (st == 0)
pen_x += delta.x >> 6;
@@ -146,16 +146,167 @@
pen_x += g->advance;
g_prev= g;
- g_prev_index= glyph_index;
}
}
+void blf_font_buffer(FontBLF *font, char *str)
+{
+ unsigned char *data, *cbuf;
+ unsigned int c;
+ GlyphBLF *g, *g_prev;
+ FT_Vector delta;
+ FT_UInt glyph_index;
+ float a, *fbuf;
+ int pen_x, pen_y, y, x, yb, diff;
+ int i, has_kerning, st, chx, chy;
+
+ if (!font->glyph_cache)
+ return;
+
+ i= 0;
+ pen_x= (int)font->pos[0];
+ pen_y= (int)font->pos[1];
+ has_kerning= FT_HAS_KERNING(font->face);
+ g_prev= NULL;
+
+ while (str[i]) {
+ c= blf_utf8_next((unsigned char *)str, &i);
+ if (c == 0)
+ break;
+
+ g= blf_glyph_search(font->glyph_cache, c);
+ if (!g) {
+ glyph_index= FT_Get_Char_Index(font->face, c);
+ g= blf_glyph_add(font, glyph_index, c);
+ }
+
+ /* if we don't found a glyph, skip it. */
+ if (!g)
+ continue;
+
+ if (has_kerning && g_prev) {
+ delta.x= 0;
+ delta.y= 0;
+
+ if (font->flags & BLF_KERNING_DEFAULT)
+ st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, ft_kerning_default, &delta);
+ else
+ st= FT_Get_Kerning(font->face, g_prev->idx, g->idx, FT_KERNING_UNFITTED, &delta);
+
+ if (st == 0)
+ pen_x += delta.x >> 6;
+ }
+
+ chx= pen_x + ((int)g->pos_x);
+ diff= g->height - ((int)g->pos_y);
+ if (diff > 0) {
+ if (g->pitch < 0)
+ pen_y += diff;
+ else
+ pen_y -= diff;
+ }
+ else if (diff < 0) {
+ if (g->pitch < 0)
+ pen_y -= diff;
+ else
+ pen_y += diff;
+ }
+
+ if (g->pitch < 0)
+ chy= pen_y - ((int)g->pos_y);
+ else
+ chy= pen_y + ((int)g->pos_y);
+
+ if (font->b_fbuf) {
+ if (chx >= 0 && chx < font->bw && pen_y >= 0 && pen_y < font->bh) {
+ if (g->pitch < 0)
+ yb= 0;
+ else
+ yb= g->height-1;
+
+ for (y= 0; y < g->height; y++) {
+ for (x= 0; x < g->width; x++) {
+ fbuf= font->b_fbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw));
+ data= g->bitmap + x + (yb * g->pitch);
+ a= data[0]/255.0f;
+
+ if (a == 1.0) {
+ fbuf[0]= font->b_col[0];
+ fbuf[1]= font->b_col[1];
+ fbuf[2]= font->b_col[2];
+ }
+ else {
+ fbuf[0]= (font->b_col[0]*a) + (fbuf[0] * (1-a));
+ fbuf[1]= (font->b_col[1]*a) + (fbuf[1] * (1-a));
+ fbuf[2]= (font->b_col[2]*a) + (fbuf[2] * (1-a));
+ }
+ }
+
+ if (g->pitch < 0)
+ yb++;
+ else
+ yb--;
+ }
+ }
+ }
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list