[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58633] branches/soc-2013-cycles_volume: - Merged trunk, up to revision 58632.
Rafael Campos
rafaelcdn at gmail.com
Fri Jul 26 21:58:20 CEST 2013
Revision: 58633
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58633
Author: jehuty
Date: 2013-07-26 19:58:19 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
- Merged trunk, up to revision 58632.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58632
Modified Paths:
--------------
branches/soc-2013-cycles_volume/CMakeLists.txt
branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake
branches/soc-2013-cycles_volume/extern/libredcode/codec.c
branches/soc-2013-cycles_volume/extern/libredcode/codec.h
branches/soc-2013-cycles_volume/extern/libredcode/debayer.c
branches/soc-2013-cycles_volume/extern/libredcode/debayer.h
branches/soc-2013-cycles_volume/extern/libredcode/format.c
branches/soc-2013-cycles_volume/extern/libredcode/format.h
branches/soc-2013-cycles_volume/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2013-cycles_volume/intern/bsp/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_test.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/presets.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/properties.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_object.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_sync.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_cpu.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_light.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_random.h
branches/soc-2013-cycles_volume/intern/cycles/render/film.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/light.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/session.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/tables.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_task.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_task.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_view.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_DropTargetX11.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2013-cycles_volume/intern/iksolver/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/opencl/OCL_opencl.h
branches/soc-2013-cycles_volume/intern/opencl/intern/OCL_opencl.c
branches/soc-2013-cycles_volume/intern/opencl/intern/clew.c
branches/soc-2013-cycles_volume/intern/smoke/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/tools/credits_svn_gen.py
branches/soc-2013-cycles_volume/release/datafiles/LICENSE-droidsans.ttf.txt
branches/soc-2013-cycles_volume/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2013-cycles_volume/release/datafiles/splash.png
branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/node.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_volume/source/blender/avi/intern/avi.c
branches/soc-2013-cycles_volume/source/blender/avi/intern/avi_options.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_global.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_key.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_text.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/action.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/armature.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/camera.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/deform.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/editmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/effect.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/font.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/implicit.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/ipo.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mask.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/multires.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/paint.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/property.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/scene.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/text.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/texture.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_string.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/fileops.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/listbase.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_color.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/noise.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/storage.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/string.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_volume/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-cycles_volume/source/blender/collada/AnimationImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/ArmatureImporter.h
branches/soc-2013-cycles_volume/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/MeshImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/TransformWriter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/collada_utils.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_filter.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_markers.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/drivers.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/keyframing.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/keyingsets.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_relations.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_select.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_slide.c
branches/soc-2013-cycles_volume/source/blender/editors/curve/curve_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/curve/curve_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_volume/source/blender/editors/curve/editfont.c
branches/soc-2013-cycles_volume/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2013-cycles_volume/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_armature.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_panel.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/resources.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_add.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_select.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editface.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_hook.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/object/object_lattice.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_modifier.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_transform.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_volume/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_opengl.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_shading.c
branches/soc-2013-cycles_volume/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2013-cycles_volume/source/blender/editors/space_action/action_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_action/action_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_action/action_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_action/space_action.c
branches/soc-2013-cycles_volume/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_volume/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_file/filelist.c
branches/soc-2013-cycles_volume/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-cycles_volume/source/blender/editors/space_image/image_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_image/space_image.c
branches/soc-2013-cycles_volume/source/blender/editors/space_info/space_info.c
branches/soc-2013-cycles_volume/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-cycles_volume/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_add.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_templates.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/space_node.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-cycles_volume/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2013-cycles_volume/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_text/space_text.c
branches/soc-2013-cycles_volume/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-cycles_volume/source/blender/editors/space_time/space_time.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform.h
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_generics.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-cycles_volume/source/blender/editors/util/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_volume/source/blender/editors/util/numinput.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/anim_movie.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/indexer.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/png.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/util.c
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_image.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_util.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_util.h
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2013-cycles_volume/source/blender/nodes/NOD_static_types.h
branches/soc-2013-cycles_volume/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-cycles_volume/source/blender/nodes/intern/node_socket.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2013-cycles_volume/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-cycles_volume/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2013-cycles_volume/source/blender/render/intern/source/external_engine.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/render_texture.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/wm_event_types.h
branches/soc-2013-cycles_volume/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_volume/source/creator/creator.c
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/soc-2013-cycles_volume/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2013-cycles_volume/source/gameengine/Expressions/IntValue.cpp
branches/soc-2013-cycles_volume/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/SCA_IScene.cpp
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/SConscript
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-cycles_volume/source/gameengine/Network/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2013-cycles_volume/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2013-cycles_volume/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_holes.c
Removed Paths:
-------------
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_System.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/GPC_System.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/load.blend
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/logo_blender.raw
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/logo_blender3d.raw
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/common/logo_nan.raw
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/xembed/
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
Property Changed:
----------------
branches/soc-2013-cycles_volume/
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_volume
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-58235
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-58632
Modified: branches/soc-2013-cycles_volume/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/CMakeLists.txt 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/CMakeLists.txt 2013-07-26 19:58:19 UTC (rev 58633)
@@ -1891,6 +1891,7 @@
set(REDCODE_INC ${REDCODE})
endif()
+<<<<<<< .working
if(WITH_CYCLES_OPENVDB)
set(OPENVDB_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/openvdb/internal")
@@ -1898,9 +1899,8 @@
#-----------------------------------------------------------------------------
# Blender WebPlugin
-
-if(WITH_WEBPLUGIN)
- set(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+=======
+>>>>>>> .merge-right.r58632
set(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
set(WITH_PLAYER ON)
@@ -1999,6 +1999,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) # C only
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2025,6 +2026,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2075,6 +2077,20 @@
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake 2013-07-26 19:58:19 UTC (rev 58633)
@@ -535,7 +535,9 @@
foreach(_SOURCE ${ARGV})
- if(CMAKE_COMPILER_IS_GNUCC)
+ if(CMAKE_COMPILER_IS_GNUCC OR
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+
set_source_files_properties(${_SOURCE}
PROPERTIES
COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
Modified: branches/soc-2013-cycles_volume/extern/libredcode/codec.c
===================================================================
--- branches/soc-2013-cycles_volume/extern/libredcode/codec.c 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/extern/libredcode/codec.c 2013-07-26 19:58:19 UTC (rev 58633)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Libredcode is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
#include "codec.h"
#include "format.h"
#include "debayer.h"
Modified: branches/soc-2013-cycles_volume/extern/libredcode/codec.h
===================================================================
--- branches/soc-2013-cycles_volume/extern/libredcode/codec.h 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/extern/libredcode/codec.h 2013-07-26 19:58:19 UTC (rev 58633)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Libredcode is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
#ifndef __CODEC_H__
#define __CODEC_H__
Modified: branches/soc-2013-cycles_volume/extern/libredcode/debayer.c
===================================================================
--- branches/soc-2013-cycles_volume/extern/libredcode/debayer.c 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/extern/libredcode/debayer.c 2013-07-26 19:58:19 UTC (rev 58633)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Libredcode is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
#include "debayer.h"
/* pretty simple but astonishingly very effective "debayer" function
Modified: branches/soc-2013-cycles_volume/extern/libredcode/debayer.h
===================================================================
--- branches/soc-2013-cycles_volume/extern/libredcode/debayer.h 2013-07-26 19:29:13 UTC (rev 58632)
+++ branches/soc-2013-cycles_volume/extern/libredcode/debayer.h 2013-07-26 19:58:19 UTC (rev 58633)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list