[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50008] branches/soc-2012-bratwurst: svn merge ^/trunk/blender -r49800:49900

Campbell Barton ideasman42 at gmail.com
Sun Aug 19 13:01:31 CEST 2012


Revision: 50008
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50008
Author:   campbellbarton
Date:     2012-08-19 11:01:31 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49800:49900

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

Modified Paths:
--------------
    branches/soc-2012-bratwurst/CMakeLists.txt
    branches/soc-2012-bratwurst/SConstruct
    branches/soc-2012-bratwurst/build_files/cmake/cmake_netbeans_project.py
    branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
    branches/soc-2012-bratwurst/build_files/scons/config/linux-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py
    branches/soc-2012-bratwurst/build_files/scons/tools/Blender.py
    branches/soc-2012-bratwurst/build_files/scons/tools/btools.py
    branches/soc-2012-bratwurst/extern/eltopo/SConscript
    branches/soc-2012-bratwurst/extern/eltopo/common/runstats.h
    branches/soc-2012-bratwurst/intern/container/CTR_HashedPtr.h
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2012-bratwurst/intern/guardedalloc/test/simpletest/memtest.c
    branches/soc-2012-bratwurst/intern/string/STR_String.h
    branches/soc-2012-bratwurst/release/datafiles/startup.blend
    branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2012-bratwurst/source/blender/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/blenfont/BLF_api.h
    branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf.c
    branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_font.c
    branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_material.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/blenkernel/SConscript
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/key.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/material.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sca.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/unit.c
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_array.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_rect.h
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_geom.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/rct.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/scanfill.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_structure.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2012-bratwurst/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2012-bratwurst/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/DocumentImporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/EffectExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/InstanceWriter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/MaterialExporter.h
    branches/soc-2012-bratwurst/source/blender/collada/MeshImporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/MeshImporter.h
    branches/soc-2012-bratwurst/source/blender/collada/collada_utils.cpp
    branches/soc-2012-bratwurst/source/blender/collada/collada_utils.h
    branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/compositor/COM_compositor.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/SConscript
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_datafiles.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_object.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_view3d.h
    branches/soc-2012-bratwurst/source/blender/editors/include/UI_view2d.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/view2d_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editface.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_bake.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_hook.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_relations.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_select.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_transform.c
    branches/soc-2012-bratwurst/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
    branches/soc-2012-bratwurst/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
    branches/soc-2012-bratwurst/source/blender/editors/render/render_preview.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/screendump.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
    branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_view.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2012-bratwurst/source/blender/gpu/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/gpu/SConscript
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
    branches/soc-2012-bratwurst/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/bmp.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/divers.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/iris.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/jpeg.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/metadata.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/png.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/readimage.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/rectop.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/rotate.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/scaling.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/targa.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/thumbs.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/tiff.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/util.c
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_action_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_view2d_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_ops.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/pixelblending.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/windowmanager/SConscript
    branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
    branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2012-bratwurst/source/creator/creator.c
    branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2012-bratwurst/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2012-bratwurst/source/gameengine/Expressions/StringValue.h
    branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2012-bratwurst/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2012-bratwurst/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PythonInit.cpp

Added Paths:
-----------
    branches/soc-2012-bratwurst/release/datafiles/bfont.pfb
    branches/soc-2012-bratwurst/release/datafiles/prvicons.png
    branches/soc-2012-bratwurst/source/blender/datatoc/
    branches/soc-2012-bratwurst/source/blender/datatoc/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/datatoc/datatoc.c

Removed Paths:
-------------
    branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
    branches/soc-2012-bratwurst/release/datafiles/.Bfont
    branches/soc-2012-bratwurst/release/datafiles/prvicons
    branches/soc-2012-bratwurst/source/blender/datatoc/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/datatoc/datatoc.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/Bfont.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/add.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/bfont.ttf.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/blender_icons.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/blob.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/blur.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/bmonofont.ttf.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/clay.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/claystrips.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/clone.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/crease.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/darken.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/draw.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/fill.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/flatten.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/grab.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/inflate.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/layer.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/lighten.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/mask.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/mix.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/multiply.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/nudge.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/pinch.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/prvicons.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/scrape.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/smear.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/smooth.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/snake_hook.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/soften.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/splash.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/subtract.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/texdraw.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/thumb.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/twist.png.c
    branches/soc-2012-bratwurst/source/blender/editors/datafiles/vertexdraw.png.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_material.glsl.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
    branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c

Property Changed:
----------------
    branches/soc-2012-bratwurst/
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/


Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49800
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49900

Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt	2012-08-19 10:54:07 UTC (rev 50007)
+++ branches/soc-2012-bratwurst/CMakeLists.txt	2012-08-19 11:01:31 UTC (rev 50008)
@@ -983,9 +983,10 @@
 			# normally cached but not since we include them with blender
 			set(PYTHON_VERSION 3.2) # CACHE STRING)
 			set_lib_path(PYTHON "python")
-			set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
 			set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
-			
+			#Shared includes for both vc2008 and vc2010
+			set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+
 			# uncached vars
 			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
 			set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")

Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct	2012-08-19 10:54:07 UTC (rev 50007)
+++ branches/soc-2012-bratwurst/SConstruct	2012-08-19 11:01:31 UTC (rev 50008)
@@ -455,7 +455,7 @@
 # use for includes
 env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
 env['DATA_SOURCES'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_sources")
-def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
+def data_to_c(FILE_FROM, FILE_TO, VAR_NAME):
     if os.sep == "\\":
         FILE_FROM = FILE_FROM.replace("/", "\\")
         FILE_TO   = FILE_TO.replace("/", "\\")
@@ -486,18 +486,70 @@
     fpin.close()
     fpout.close()
 
-ensure_data("source/blender/compositor/operations/COM_OpenCLKernels.cl",
-            B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
-            "clkernelstoh_COM_OpenCLKernels_cl")
+def data_to_c_simple(FILE_FROM):
+	filename_only = os.path.basename(FILE_FROM)
+	FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
+	VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
+	
+	data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
+	
 
-ensure_data("./release/datafiles/startup.blend",
-            B.root_build_dir + "data_sources/startup.blend.c",
-            "datatoc_startup_blend")
+data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+          B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+          "datatoc_COM_OpenCLKernels_cl")
 
-ensure_data("./release/datafiles/preview.blend",
-            B.root_build_dir + "data_sources/preview.blend.c",
-            "datatoc_preview_blend")
+data_to_c_simple("release/datafiles/startup.blend")
+data_to_c_simple("release/datafiles/preview.blend")
 
+# --- glsl ---
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+
+# --- blender ---
+data_to_c_simple("release/datafiles/bfont.pfb")
+data_to_c_simple("release/datafiles/bfont.ttf")
+data_to_c_simple("release/datafiles/bmonofont.ttf")
+
+data_to_c_simple("release/datafiles/splash.png")
+data_to_c_simple("release/datafiles/blender_icons.png")
+data_to_c_simple("release/datafiles/prvicons.png")
+
+data_to_c_simple("release/datafiles/brushicons/add.png")
+data_to_c_simple("release/datafiles/brushicons/blob.png")
+data_to_c_simple("release/datafiles/brushicons/blur.png")
+data_to_c_simple("release/datafiles/brushicons/clay.png")
+data_to_c_simple("release/datafiles/brushicons/claystrips.png")
+data_to_c_simple("release/datafiles/brushicons/clone.png")
+data_to_c_simple("release/datafiles/brushicons/crease.png")
+data_to_c_simple("release/datafiles/brushicons/darken.png")
+data_to_c_simple("release/datafiles/brushicons/draw.png")
+data_to_c_simple("release/datafiles/brushicons/fill.png")
+data_to_c_simple("release/datafiles/brushicons/flatten.png")
+data_to_c_simple("release/datafiles/brushicons/grab.png")
+data_to_c_simple("release/datafiles/brushicons/inflate.png")
+data_to_c_simple("release/datafiles/brushicons/layer.png")
+data_to_c_simple("release/datafiles/brushicons/lighten.png")
+data_to_c_simple("release/datafiles/brushicons/mask.png")
+data_to_c_simple("release/datafiles/brushicons/mix.png")
+data_to_c_simple("release/datafiles/brushicons/multiply.png")
+data_to_c_simple("release/datafiles/brushicons/nudge.png")
+data_to_c_simple("release/datafiles/brushicons/pinch.png")
+data_to_c_simple("release/datafiles/brushicons/scrape.png")
+data_to_c_simple("release/datafiles/brushicons/smear.png")
+data_to_c_simple("release/datafiles/brushicons/smooth.png")
+data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
+data_to_c_simple("release/datafiles/brushicons/soften.png")
+data_to_c_simple("release/datafiles/brushicons/subtract.png")
+data_to_c_simple("release/datafiles/brushicons/texdraw.png")
+data_to_c_simple("release/datafiles/brushicons/thumb.png")
+data_to_c_simple("release/datafiles/brushicons/twist.png")
+data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
+
 ##### END DATAFILES ##########
 
 Help(opts.GenerateHelpText(env))

Modified: branches/soc-2012-bratwurst/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/cmake_netbeans_project.py	2012-08-19 10:54:07 UTC (rev 50007)
+++ branches/soc-2012-bratwurst/build_files/cmake/cmake_netbeans_project.py	2012-08-19 11:01:31 UTC (rev 50008)
@@ -24,7 +24,7 @@
 
 """
 Example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
+ python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
 
 Windows not supported so far
 """

Deleted: branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake	2012-08-19 10:54:07 UTC (rev 50007)
+++ branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake	2012-08-19 11:01:31 UTC (rev 50008)
@@ -1,25 +0,0 @@
-# cmake script, to be called on its own with 3 defined args
-#
-# - FILE_FROM
-# - FILE_TO
-# - VAR_NAME
-
-# not highly optimal, may replace with generated C program like makesdna
-file(READ ${FILE_FROM} file_from_string HEX)
-string(LENGTH ${file_from_string} _max_index)
-math(EXPR size_on_disk ${_max_index}/2)
-
-file(REMOVE ${FILE_TO})
-
-file(APPEND ${FILE_TO} "int  ${VAR_NAME}_size = ${size_on_disk};\n")
-file(APPEND ${FILE_TO} "char ${VAR_NAME}[] = {")
-
-set(_index 0)
-
-while(NOT _index EQUAL _max_index)
-    string(SUBSTRING "${file_from_string}" ${_index} 2 _pair)
-    file(APPEND ${FILE_TO} "0x${_pair},")
-    math(EXPR _index ${_index}+2)
-endwhile()
-# null terminator not essential but good if we want plane strings encoded
-file(APPEND ${FILE_TO} "0x00};\n")

Modified: branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/macros.cmake	2012-08-19 10:54:07 UTC (rev 50007)
+++ branches/soc-2012-bratwurst/build_files/cmake/macros.cmake	2012-08-19 11:01:31 UTC (rev 50008)
@@ -727,20 +727,43 @@
 endmacro()
 
 
-# TODO, create a C binary and call it instead!, doing this in cmake its slow
 macro(data_to_c
-      file_from file_to var_name
+      file_from file_to
       list_to_add)
 
 	list(APPEND ${list_to_add} ${file_to})
 
+	get_filename_component(_file_to_path ${file_to} PATH)
+
 	add_custom_command(
 		OUTPUT ${file_to}
-		COMMAND ${CMAKE_COMMAND}
-				-DFILE_FROM=${file_from}
-				-DFILE_TO=${file_to}
-				-DVAR_NAME=${var_name}
-				-P ${CMAKE_SOURCE_DIR}/build_files/cmake/data_to_c.cmake
-		DEPENDS ${file_from})
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+		DEPENDS ${file_from} datatoc)
+	unset(_file_to_path)
 endmacro()
 
+
+# same as above but generates the var name and output automatic.
+macro(data_to_c_simple
+      file_from
+      list_to_add)
+
+	# remove ../'s
+	get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}   REALPATH)
+	get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
+
+	list(APPEND ${list_to_add} ${_file_to})
+
+	get_filename_component(_file_to_path ${_file_to} PATH)
+
+	add_custom_command(
+		OUTPUT  ${_file_to}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list