[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59582] branches/soc-2013-paint: merge with trunk -r59581.
Antony Riakiotakis
kalast at gmail.com
Wed Aug 28 03:55:48 CEST 2013
Revision: 59582
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59582
Author: psy-fi
Date: 2013-08-28 01:55:47 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
merge with trunk -r59581. This is my first svn merge, carrying merge information etc. after my local git svn repository kicked the bucket (lesson learned: don't merge between git-svn branches). Things may have gone bad during the merge, because I had to practically merge since the start of GSOC but I've checked that at least it compiles and works.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59581
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/GNUmakefile
branches/soc-2013-paint/build_files/cmake/macros.cmake
branches/soc-2013-paint/intern/cycles/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/app/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/cmake/external_libs.cmake
branches/soc-2013-paint/intern/cycles/util/CMakeLists.txt
branches/soc-2013-paint/release/datafiles/blender_icons.sh
branches/soc-2013-paint/release/datafiles/blender_icons.svg
branches/soc-2013-paint/release/datafiles/blender_icons16.png
branches/soc-2013-paint/release/datafiles/blender_icons32.png
branches/soc-2013-paint/release/datafiles/prvicons.png
branches/soc-2013-paint/release/datafiles/prvicons.sh
branches/soc-2013-paint/release/scripts/modules/rna_info.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/__init__.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-paint/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-paint/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-paint/source/blender/blenkernel/BKE_node.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-paint/source/blender/blenkernel/intern/blender.c
branches/soc-2013-paint/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/context.c
branches/soc-2013-paint/source/blender/blenkernel/intern/displist.c
branches/soc-2013-paint/source/blender/blenkernel/intern/group.c
branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
branches/soc-2013-paint/source/blender/blenkernel/intern/key.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-paint/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-paint/source/blender/blenkernel/intern/property.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sca.c
branches/soc-2013-paint/source/blender/blenkernel/intern/screen.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-paint/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-paint/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-paint/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-paint/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-paint/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-paint/source/blender/blenlib/intern/listbase.c
branches/soc-2013-paint/source/blender/blenlib/intern/path_util.c
branches/soc-2013-paint/source/blender/blenloader/intern/readblenentry.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/blenloader/intern/undofile.c
branches/soc-2013-paint/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_walkers.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-paint/source/blender/editors/animation/anim_filter.c
branches/soc-2013-paint/source/blender/editors/curve/editcurve.c
branches/soc-2013-paint/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/include/ED_mask.h
branches/soc-2013-paint/source/blender/editors/include/ED_uvedit.h
branches/soc-2013-paint/source/blender/editors/include/UI_icons.h
branches/soc-2013-paint/source/blender/editors/include/UI_interface.h
branches/soc-2013-paint/source/blender/editors/include/UI_view2d.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_layout.c
branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
branches/soc-2013-paint/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-paint/source/blender/editors/interface/view2d.c
branches/soc-2013-paint/source/blender/editors/mask/mask_add.c
branches/soc-2013-paint/source/blender/editors/mask/mask_edit.c
branches/soc-2013-paint/source/blender/editors/mask/mask_intern.h
branches/soc-2013-paint/source/blender/editors/mask/mask_ops.c
branches/soc-2013-paint/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-paint/source/blender/editors/object/object_edit.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-paint/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-paint/source/blender/editors/space_file/filesel.c
branches/soc-2013-paint/source/blender/editors/space_file/space_file.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_select.c
branches/soc-2013-paint/source/blender/editors/space_image/space_image.c
branches/soc-2013-paint/source/blender/editors/space_node/drawnode.c
branches/soc-2013-paint/source/blender/editors/space_node/node_buttons.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-paint/source/blender/gpu/GPU_buffers.h
branches/soc-2013-paint/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-paint/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-paint/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_screen_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-paint/source/blender/makesrna/RNA_access.h
branches/soc-2013-paint/source/blender/makesrna/RNA_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_rna.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_array.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2013-paint/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-paint/source/blender/python/intern/bpy_rna.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-paint/source/creator/creator.c
branches/soc-2013-paint/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_MeshObject.cpp
Added Paths:
-----------
branches/soc-2013-paint/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-paint/release/scripts/startup/bl_operators/mask.py
Removed Paths:
-------------
branches/soc-2013-paint/scons/scons-local-1.2.0.d20090223/
branches/soc-2013-paint/source/gameengine/GamePlayer/xembed/
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/extern/carve/include/carve/aabb.hpp
branches/soc-2013-paint/extern/carve/include/carve/aabb_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/carve.hpp
branches/soc-2013-paint/extern/carve/include/carve/classification.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection/unordered.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection.hpp
branches/soc-2013-paint/extern/carve/include/carve/collection_types.hpp
branches/soc-2013-paint/extern/carve/include/carve/colour.hpp
branches/soc-2013-paint/extern/carve/include/carve/convex_hull.hpp
branches/soc-2013-paint/extern/carve/include/carve/csg.hpp
branches/soc-2013-paint/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2013-paint/extern/carve/include/carve/debug_hooks.hpp
branches/soc-2013-paint/extern/carve/include/carve/djset.hpp
branches/soc-2013-paint/extern/carve/include/carve/edge_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/edge_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/exact.hpp
branches/soc-2013-paint/extern/carve/include/carve/external/boost/random.hpp
branches/soc-2013-paint/extern/carve/include/carve/face_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/face_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/faceloop.hpp
branches/soc-2013-paint/extern/carve/include/carve/geom.hpp
branches/soc-2013-paint/extern/carve/include/carve/geom2d.hpp
branches/soc-2013-paint/extern/carve/include/carve/geom3d.hpp
branches/soc-2013-paint/extern/carve/include/carve/geom_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/heap.hpp
branches/soc-2013-paint/extern/carve/include/carve/input.hpp
branches/soc-2013-paint/extern/carve/include/carve/interpolator.hpp
branches/soc-2013-paint/extern/carve/include/carve/intersection.hpp
branches/soc-2013-paint/extern/carve/include/carve/iobj.hpp
branches/soc-2013-paint/extern/carve/include/carve/kd_node.hpp
branches/soc-2013-paint/extern/carve/include/carve/math.hpp
branches/soc-2013-paint/extern/carve/include/carve/math_constants.hpp
branches/soc-2013-paint/extern/carve/include/carve/matrix.hpp
branches/soc-2013-paint/extern/carve/include/carve/mesh.hpp
branches/soc-2013-paint/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/mesh_ops.hpp
branches/soc-2013-paint/extern/carve/include/carve/mesh_simplify.hpp
branches/soc-2013-paint/extern/carve/include/carve/octree_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/octree_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/pointset.hpp
branches/soc-2013-paint/extern/carve/include/carve/pointset_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/pointset_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/pointset_iter.hpp
branches/soc-2013-paint/extern/carve/include/carve/poly.hpp
branches/soc-2013-paint/extern/carve/include/carve/poly_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/poly_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyhedron_base.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyhedron_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyhedron_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyline.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyline_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/polyline_iter.hpp
branches/soc-2013-paint/extern/carve/include/carve/rescale.hpp
branches/soc-2013-paint/extern/carve/include/carve/rtree.hpp
branches/soc-2013-paint/extern/carve/include/carve/spacetree.hpp
branches/soc-2013-paint/extern/carve/include/carve/tag.hpp
branches/soc-2013-paint/extern/carve/include/carve/timing.hpp
branches/soc-2013-paint/extern/carve/include/carve/tree.hpp
branches/soc-2013-paint/extern/carve/include/carve/triangulator.hpp
branches/soc-2013-paint/extern/carve/include/carve/triangulator_impl.hpp
branches/soc-2013-paint/extern/carve/include/carve/util.hpp
branches/soc-2013-paint/extern/carve/include/carve/vector.hpp
branches/soc-2013-paint/extern/carve/include/carve/vertex_decl.hpp
branches/soc-2013-paint/extern/carve/include/carve/vertex_impl.hpp
branches/soc-2013-paint/extern/carve/lib/csg_collector.hpp
branches/soc-2013-paint/extern/carve/lib/csg_data.hpp
branches/soc-2013-paint/extern/carve/lib/csg_detail.hpp
branches/soc-2013-paint/extern/carve/lib/intersect_classify_common.hpp
branches/soc-2013-paint/extern/carve/lib/intersect_classify_common_impl.hpp
branches/soc-2013-paint/extern/carve/lib/intersect_common.hpp
branches/soc-2013-paint/extern/carve/lib/intersect_debug.hpp
branches/soc-2013-paint/extern/carve/patches/files/random.hpp
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-paint/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
branches/soc-2013-paint/intern/cycles/kernel/kernel.cl
branches/soc-2013-paint/intern/cycles/kernel/kernel.cu
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-paint/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-paint/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-paint/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-paint/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-paint/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-paint/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-paint/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2013-paint/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2013-paint/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2013-paint/source/blender/editors/include/ED_buttons.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/space_outliner/
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Property changes on: branches/soc-2013-paint
___________________________________________________________________
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,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
+ /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-59581
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-08-27 23:34:16 UTC (rev 59581)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-08-28 01:55:47 UTC (rev 59582)
@@ -261,7 +261,7 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
-option(WITH_CYCLES_TEST "Build cycles test application" OFF)
+option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
@@ -373,7 +373,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
Modified: branches/soc-2013-paint/GNUmakefile
===================================================================
--- branches/soc-2013-paint/GNUmakefile 2013-08-27 23:34:16 UTC (rev 59581)
+++ branches/soc-2013-paint/GNUmakefile 2013-08-28 01:55:47 UTC (rev 59582)
@@ -184,6 +184,7 @@
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
@echo "Utilities (not associated with building blender)"
+ @echo " * icons - updates PNG icons from SVG files."
@echo " * tbz - create a compressed svn export 'blender_archive.tar.bz2'"
@echo ""
@echo "Documentation Targets (not associated with building blender)"
@@ -322,7 +323,11 @@
rm -rf blender_archive/
@echo "blender_archive.tar.bz2 written"
+icons:
+ $(BLENDER_DIR)/release/datafiles/blender_icons.sh
+ $(BLENDER_DIR)/release/datafiles/prvicons.sh
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/soc-2013-paint/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-08-27 23:34:16 UTC (rev 59581)
+++ branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-08-28 01:55:47 UTC (rev 59582)
@@ -802,6 +802,7 @@
endmacro()
+# XXX Not used for now...
macro(svg_to_png
file_from
file_to
@@ -818,6 +819,15 @@
mark_as_advanced(INKSCAPE_EXE)
if(INKSCAPE_EXE)
+ if(APPLE)
+ # in OS X app bundle, the binary is a shim that doesn't take any
+ # command line arguments, replace it with the actual binary
+ string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
+ if(EXISTS "${INKSCAPE_REAL_EXE}")
+ set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
+ endif()
+ endif()
+
add_custom_command(
OUTPUT ${_file_to}
COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
@@ -830,4 +840,4 @@
unset(_file_from)
unset(_file_to)
-endmacro()
\ No newline at end of file
+endmacro()
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/aabb.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/aabb_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/carve.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/classification.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/boost_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/std_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection/unordered.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/collection_types.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/colour.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/convex_hull.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/csg.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/csg_triangulator.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/debug_hooks.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/djset.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/edge_decl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/edge_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/exact.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/external/boost/random.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/face_decl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/face_impl.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/faceloop.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2013-paint/extern/carve/include/carve/geom.hpp
___________________________________________________________________
Added: svn:eol-style
+ native
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list