[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60559] branches/vgroup_modifiers: svn merge -r 56750:57000 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Sat Oct 5 11:48:10 CEST 2013
Revision: 60559
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60559
Author: mont29
Date: 2013-10-05 09:48:09 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
svn merge -r 56750:57000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/GNUmakefile
branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
branches/vgroup_modifiers/build_files/cmake/Modules/FindOpenJPEG.cmake
branches/vgroup_modifiers/build_files/cmake/project_info.py
branches/vgroup_modifiers/build_files/scons/tools/Blender.py
branches/vgroup_modifiers/extern/libmv/ChangeLog
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/detect.cc
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/detect.h
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/vgroup_modifiers/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/vgroup_modifiers/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
branches/vgroup_modifiers/extern/libmv/libmv-capi.h
branches/vgroup_modifiers/extern/libmv/libmv-capi_stub.cc
branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_curves.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_util.h
branches/vgroup_modifiers/intern/cycles/bvh/bvh.cpp
branches/vgroup_modifiers/intern/cycles/device/device_cpu.cpp
branches/vgroup_modifiers/intern/cycles/device/device_cuda.cpp
branches/vgroup_modifiers/intern/cycles/device/device_network.h
branches/vgroup_modifiers/intern/cycles/device/device_opencl.cpp
branches/vgroup_modifiers/intern/cycles/device/device_task.cpp
branches/vgroup_modifiers/intern/cycles/device/device_task.h
branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_toon.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_util.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_westin.h
branches/vgroup_modifiers/intern/cycles/kernel/closure/bssrdf.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel.cl
branches/vgroup_modifiers/intern/cycles/kernel/kernel.cpp
branches/vgroup_modifiers/intern/cycles/kernel/kernel.cu
branches/vgroup_modifiers/intern/cycles/kernel/kernel.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_camera.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_film.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_light.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_montecarlo.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp
branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp
branches/vgroup_modifiers/intern/cycles/kernel/osl/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_closures.cpp
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_closures.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.cpp
branches/vgroup_modifiers/intern/cycles/kernel/shaders/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_math.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/stdosl.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_checker.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_closure.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_gradient.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_math.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_types.h
branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
branches/vgroup_modifiers/intern/cycles/render/nodes.h
branches/vgroup_modifiers/intern/cycles/render/session.cpp
branches/vgroup_modifiers/intern/cycles/util/util_boundbox.h
branches/vgroup_modifiers/intern/cycles/util/util_math.h
branches/vgroup_modifiers/intern/cycles/util/util_transform.h
branches/vgroup_modifiers/intern/ghost/SConscript
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowX11.cpp
branches/vgroup_modifiers/intern/guardedalloc/MEM_guardedalloc.h
branches/vgroup_modifiers/intern/guardedalloc/intern/mallocn.c
branches/vgroup_modifiers/intern/smoke/extern/smoke_API.h
branches/vgroup_modifiers/intern/smoke/intern/FLUID_3D.cpp
branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.cpp
branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.h
branches/vgroup_modifiers/intern/smoke/intern/smoke_API.cpp
branches/vgroup_modifiers/release/datafiles/splash.png
branches/vgroup_modifiers/release/scripts/modules/console_python.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/console.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_texture.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
branches/vgroup_modifiers/source/blender/avi/SConscript
branches/vgroup_modifiers/source/blender/blenfont/SConscript
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_deform.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_editmesh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_image.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_mask.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_object.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_object_deform.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_paint.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_particle.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_tracking.h
branches/vgroup_modifiers/source/blender/blenkernel/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenkernel/SConscript
branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/addon.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/anim.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/curve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/deform.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/effect.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/idprop.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/key.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mask.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/multires.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/object_deform.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/paint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h
branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenlib/SConscript
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_args.c
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/vgroup_modifiers/source/blender/blenlib/intern/listbase.c
branches/vgroup_modifiers/source/blender/blenlib/intern/threads.c
branches/vgroup_modifiers/source/blender/blenloader/SConscript
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/bmesh/CMakeLists.txt
branches/vgroup_modifiers/source/blender/bmesh/bmesh_class.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_iterators.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_iterators.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mods.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mods.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators_private.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_bridge.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_mirror.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_utils.c
branches/vgroup_modifiers/source/blender/compositor/SConscript
branches/vgroup_modifiers/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/vgroup_modifiers/source/blender/compositor/intern/COM_NodeOperation.h
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_MathNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/vgroup_modifiers/source/blender/editors/animation/SConscript
branches/vgroup_modifiers/source/blender/editors/animation/anim_draw.c
branches/vgroup_modifiers/source/blender/editors/armature/SConscript
branches/vgroup_modifiers/source/blender/editors/curve/SConscript
branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
branches/vgroup_modifiers/source/blender/editors/datafiles/SConscript
branches/vgroup_modifiers/source/blender/editors/gpencil/SConscript
branches/vgroup_modifiers/source/blender/editors/include/ED_anim_api.h
branches/vgroup_modifiers/source/blender/editors/include/ED_image.h
branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h
branches/vgroup_modifiers/source/blender/editors/include/ED_screen.h
branches/vgroup_modifiers/source/blender/editors/include/UI_view2d.h
branches/vgroup_modifiers/source/blender/editors/interface/SConscript
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_ops.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
branches/vgroup_modifiers/source/blender/editors/interface/view2d.c
branches/vgroup_modifiers/source/blender/editors/io/SConscript
branches/vgroup_modifiers/source/blender/editors/mask/SConscript
branches/vgroup_modifiers/source/blender/editors/mesh/SConscript
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_loopcut.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_utils.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
branches/vgroup_modifiers/source/blender/editors/metaball/SConscript
branches/vgroup_modifiers/source/blender/editors/object/SConscript
branches/vgroup_modifiers/source/blender/editors/object/object_modifier.c
branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
branches/vgroup_modifiers/source/blender/editors/physics/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/physics/SConscript
branches/vgroup_modifiers/source/blender/editors/physics/particle_edit.c
branches/vgroup_modifiers/source/blender/editors/physics/physics_fluid.c
branches/vgroup_modifiers/source/blender/editors/physics/rigidbody_object.c
branches/vgroup_modifiers/source/blender/editors/render/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/render/SConscript
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/render/render_opengl.c
branches/vgroup_modifiers/source/blender/editors/render/render_preview.c
branches/vgroup_modifiers/source/blender/editors/render/render_update.c
branches/vgroup_modifiers/source/blender/editors/screen/SConscript
branches/vgroup_modifiers/source/blender/editors/screen/area.c
branches/vgroup_modifiers/source/blender/editors/screen/screen_edit.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/SConscript
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_cursor.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_stroke.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
branches/vgroup_modifiers/source/blender/editors/sound/SConscript
branches/vgroup_modifiers/source/blender/editors/space_action/SConscript
branches/vgroup_modifiers/source/blender/editors/space_action/space_action.c
branches/vgroup_modifiers/source/blender/editors/space_api/SConscript
branches/vgroup_modifiers/source/blender/editors/space_buttons/SConscript
branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_context.c
branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_header.c
branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_intern.h
branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_texture.c
branches/vgroup_modifiers/source/blender/editors/space_buttons/space_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_clip/SConscript
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_intern.h
branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
branches/vgroup_modifiers/source/blender/editors/space_console/SConscript
branches/vgroup_modifiers/source/blender/editors/space_console/space_console.c
branches/vgroup_modifiers/source/blender/editors/space_file/SConscript
branches/vgroup_modifiers/source/blender/editors/space_graph/SConscript
branches/vgroup_modifiers/source/blender/editors/space_graph/space_graph.c
branches/vgroup_modifiers/source/blender/editors/space_image/SConscript
branches/vgroup_modifiers/source/blender/editors/space_image/image_edit.c
branches/vgroup_modifiers/source/blender/editors/space_image/space_image.c
branches/vgroup_modifiers/source/blender/editors/space_info/SConscript
branches/vgroup_modifiers/source/blender/editors/space_logic/SConscript
branches/vgroup_modifiers/source/blender/editors/space_nla/SConscript
branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
branches/vgroup_modifiers/source/blender/editors/space_node/SConscript
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/SConscript
branches/vgroup_modifiers/source/blender/editors/space_script/SConscript
branches/vgroup_modifiers/source/blender/editors/space_sequencer/SConscript
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_draw.c
branches/vgroup_modifiers/source/blender/editors/space_text/SConscript
branches/vgroup_modifiers/source/blender/editors/space_text/text_autocomplete.c
branches/vgroup_modifiers/source/blender/editors/space_time/SConscript
branches/vgroup_modifiers/source/blender/editors/space_userpref/SConscript
branches/vgroup_modifiers/source/blender/editors/space_view3d/SConscript
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_header.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_ops.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_project.c
branches/vgroup_modifiers/source/blender/editors/transform/SConscript
branches/vgroup_modifiers/source/blender/editors/transform/transform_ops.c
branches/vgroup_modifiers/source/blender/editors/util/SConscript
branches/vgroup_modifiers/source/blender/editors/uvedit/SConscript
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_intern.h
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/vgroup_modifiers/source/blender/freestyle/SConscript
branches/vgroup_modifiers/source/blender/freestyle/intern/application/AppConfig.h
branches/vgroup_modifiers/source/blender/freestyle/intern/application/AppView.h
branches/vgroup_modifiers/source/blender/freestyle/intern/application/Controller.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/application/Controller.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/BBox.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Bezier.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Bezier.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/GeomCleaner.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Grid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/GridHelpers.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Noise.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Polygon.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/SweepLine.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/VecMat.h
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/image/GaussianFilter.h
branches/vgroup_modifiers/source/blender/freestyle/intern/image/Image.h
branches/vgroup_modifiers/source/blender/freestyle/intern/image/ImagePyramid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Nature.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/vgroup_modifiers/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Canvas.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Curve.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Modifiers.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Module.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Operators.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Predicates1D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Stroke.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Stroke.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeLayer.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StyleModule.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/BaseIterator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/BaseObject.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Exception.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Id.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Interpreter.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Iterator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/PointerSequence.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/ProgressBar.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/PseudoNoise.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/system/PseudoNoise.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/RandGen.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/RenderMonitor.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeStamp.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeStamp.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeUtils.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Functions0D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Functions1D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Interface0D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Interface1D.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Silhouette.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMap.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/Curvature.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/vgroup_modifiers/source/blender/gpu/SConscript
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c
branches/vgroup_modifiers/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/vgroup_modifiers/source/blender/ikplugin/SConscript
branches/vgroup_modifiers/source/blender/imbuf/SConscript
branches/vgroup_modifiers/source/blender/imbuf/intern/rectop.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_smoke_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_view3d_types.h
branches/vgroup_modifiers/source/blender/makesdna/SConscript
branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
branches/vgroup_modifiers/source/blender/makesrna/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_fluidsim.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mask.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_particle.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_smoke.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
branches/vgroup_modifiers/source/blender/modifiers/CMakeLists.txt
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/vgroup_modifiers/source/blender/nodes/CMakeLists.txt
branches/vgroup_modifiers/source/blender/nodes/NOD_shader.h
branches/vgroup_modifiers/source/blender/nodes/NOD_static_types.h
branches/vgroup_modifiers/source/blender/nodes/SConscript
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_background.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_hair_info.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_material.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_math.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_object_info.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_value.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_image.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_math.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_output.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/vgroup_modifiers/source/blender/python/SConscript
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
branches/vgroup_modifiers/source/blender/python/intern/CMakeLists.txt
branches/vgroup_modifiers/source/blender/python/intern/bpy_app_build_options.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_app_translations.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.c
branches/vgroup_modifiers/source/blender/render/SConscript
branches/vgroup_modifiers/source/blender/render/intern/include/envmap.h
branches/vgroup_modifiers/source/blender/render/intern/include/rayintersection.h
branches/vgroup_modifiers/source/blender/render/intern/include/renderdatabase.h
branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
branches/vgroup_modifiers/source/blender/render/intern/source/envmap.c
branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c
branches/vgroup_modifiers/source/blender/render/intern/source/imagetexture.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/render/intern/source/pointdensity.c
branches/vgroup_modifiers/source/blender/render/intern/source/rayshade.c
branches/vgroup_modifiers/source/blender/render/intern/source/rendercore.c
branches/vgroup_modifiers/source/blender/render/intern/source/shadeoutput.c
branches/vgroup_modifiers/source/blender/render/intern/source/sss.c
branches/vgroup_modifiers/source/blender/render/intern/source/strand.c
branches/vgroup_modifiers/source/blender/windowmanager/SConscript
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/WM_types.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_draw.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_jobs.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blenderplayer/CMakeLists.txt
branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/vgroup_modifiers/source/creator/CMakeLists.txt
branches/vgroup_modifiers/source/creator/creator.c
branches/vgroup_modifiers/source/gameengine/Converter/BL_ActionActuator.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Action.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Action.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/SConscript
Added Paths:
-----------
branches/vgroup_modifiers/doc/python_api/examples/bpy.app.translations.py
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_wireframe.osl
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_wireframe.h
branches/vgroup_modifiers/release/scripts/templates_osl/westin_closure.osl
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_grid.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_split_edges.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Removed Paths:
-------------
branches/vgroup_modifiers/intern/cycles/kernel/osl/bsdf_toon.cpp
branches/vgroup_modifiers/release/scripts/templates_osl/toon_closure.osl
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_edgeloop_fill.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_edgesplit.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56750
+ /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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-57000
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2013-10-05 08:41:23 UTC (rev 60558)
+++ branches/vgroup_modifiers/CMakeLists.txt 2013-10-05 09:48:09 UTC (rev 60559)
@@ -157,7 +157,6 @@
option(WITH_BOOL_COMPAT "Continue defining \"TRUE\" and \"FALSE\" until these can be replaced with \"true\" and \"false\" from stdbool.h" ON)
mark_as_advanced(WITH_BOOL_COMPAT)
-
# (unix defaults to OpenMP On)
if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
@@ -358,7 +357,7 @@
# force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
- add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -944,16 +943,27 @@
WITH_MINGW64)
if(WITH_MINGW64)
- message("Compiling for 64 bit with MinGW-w64.")
+ message(STATUS "Compiling for 64 bit with MinGW-w64.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
endif()
else()
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
-
# Setup 64bit and 64bit windows systems
if(CMAKE_CL_64)
- message("64 bit compiler detected.")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+ message(STATUS "64 bit compiler detected.")
+ if(MSVC11)
+ message(STATUS "Visual C++ 2012 detected.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64_vc11)
+ else()
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+ endif()
+ else()
+ # Setup 32bit windows systems
+ if(MSVC11)
+ message(STATUS "Visual C++ 2012 detected.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows_vc11)
+ else()
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+ endif()
endif()
endif()
@@ -968,7 +978,11 @@
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- set(OPENAL_LIBRARY wrap_oal)
+ if(MSVC11)
+ set(OPENAL_LIBRARY openal32)
+ else()
+ set(OPENAL_LIBRARY wrap_oal)
+ endif()
set(OPENAL_LIBPATH ${OPENAL}/lib)
endif()
@@ -1017,8 +1031,18 @@
if(MSVC)
set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
+ # MSVC11 SDL is not hard linked to dxguid.lib
+ if(MSVC11 AND WITH_SDL)
+ set(PLATFORM_LINKLIBS ${PLATFORM_LINKLIBS} dxguid)
+ endif()
+
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
+ # MSVC11 needs _ALLOW_KEYWORD_MACROS to build
+ if(MSVC11)
+ add_definitions(/D_ALLOW_KEYWORD_MACROS)
+ endif()
+
set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
set(CMAKE_C_FLAGS "/nologo /J /Gd" CACHE STRING "MSVC MT C++ flags " FORCE)
@@ -1124,13 +1148,24 @@
${LIBDIR}/ffmpeg/include
${LIBDIR}/ffmpeg/include/msvc
)
- set(FFMPEG_LIBRARIES
- ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
- ${LIBDIR}/ffmpeg/lib/avformat-53.lib
- ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
- ${LIBDIR}/ffmpeg/lib/avutil-51.lib
- ${LIBDIR}/ffmpeg/lib/swscale-2.lib
- )
+ # MSVC11 FFMPEG libs are newer
+ if(MSVC11)
+ set(FFMPEG_LIBRARIES
+ ${LIBDIR}/ffmpeg/lib/avcodec-54.lib
+ ${LIBDIR}/ffmpeg/lib/avformat-54.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice-54.lib
+ ${LIBDIR}/ffmpeg/lib/avutil-52.lib
+ ${LIBDIR}/ffmpeg/lib/swscale-2.lib
+ )
+ else()
+ set(FFMPEG_LIBRARIES
+ ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+ ${LIBDIR}/ffmpeg/lib/avformat-53.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+ ${LIBDIR}/ffmpeg/lib/avutil-51.lib
+ ${LIBDIR}/ffmpeg/lib/swscale-2.lib
+ )
+ endif()
endif()
if(WITH_IMAGE_OPENEXR)
@@ -1175,7 +1210,7 @@
# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
- #Shared includes for both vc2008 and vc2010
+ # Shared includes for both vc2008 and vc2010
set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
# uncached vars
@@ -1186,7 +1221,11 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- if(MSVC10)
+ if(MSVC11)
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
+ set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
+ elseif(MSVC10)
set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
@@ -1236,7 +1275,6 @@
set(OPENCOLORIO_DEFINITIONS)
endif()
-
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
@@ -1261,7 +1299,7 @@
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
- #Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
+ # Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
set(WITH_OPENMP OFF)
endif()
@@ -1285,7 +1323,7 @@
set(ZLIB_LIBPATH ${ZLIB}/lib)
set(ZLIB_LIBRARIES z)
- #comes with own pthread library
+ # comes with own pthread library
if(NOT WITH_MINGW64)
set(PTHREADS ${LIBDIR}/pthreads)
#set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
@@ -1408,7 +1446,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
- #Explicitly set llvm lib order.
+ # Explicitly set llvm lib order.
#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
LLVMAsmParser LLVMAsmPrinter
@@ -1428,7 +1466,7 @@
LLVMX86Disassembler LLVMX86Info
LLVMX86Utils LLVMipa
LLVMipo LLVMCore)
- #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
+ # imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
endif()
@@ -1571,7 +1609,7 @@
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- #libSDL still needs 32bit carbon quicktime
+ # libSDL still needs 32bit carbon quicktime
endif()
elseif(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
@@ -1622,7 +1660,7 @@
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
- #pcre is bundled with openCollada
+ # pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)
set(PCRE_LIBRARIES pcre)
@@ -2196,6 +2234,7 @@
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_FREESTYLE)
info_cfg_option(WITH_OPENCOLORIO)
info_cfg_text("Compiler Options:")
Modified: branches/vgroup_modifiers/GNUmakefile
===================================================================
--- branches/vgroup_modifiers/GNUmakefile 2013-10-05 08:41:23 UTC (rev 60558)
+++ branches/vgroup_modifiers/GNUmakefile 2013-10-05 09:48:09 UTC (rev 60559)
@@ -178,9 +178,9 @@
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo " * check_smatch - run blenders source through smatch (C only)"
- @echo " * check_spelling_c - check for spelling errors (OSL only)"
+ @echo " * check_spelling_c - check for spelling errors (C/C++ only)"
@echo " * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
- @echo " * check_spelling_osl - check for spelling errors (C/C++ only)"
+ @echo " * check_spelling_osl - check for spelling errors (OSL only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
@echo "Utilities (not associated with building blender)"
Modified: branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list