Revision: 43031 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43031 Author: mont29 Date: 2011-12-31 10:46:30 +0000 (Sat, 31 Dec 2011) Log Message: ----------- Merged from trunk (-r42864:43015)
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42864 Modified Paths: -------------- branches/vgroup_modifiers/CMakeLists.txt branches/vgroup_modifiers/SConstruct branches/vgroup_modifiers/build_files/cmake/macros.cmake branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py branches/vgroup_modifiers/build_files/scons/tools/btools.py branches/vgroup_modifiers/extern/CMakeLists.txt branches/vgroup_modifiers/intern/CMakeLists.txt branches/vgroup_modifiers/intern/SConscript branches/vgroup_modifiers/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp branches/vgroup_modifiers/intern/cycles/CMakeLists.txt branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp branches/vgroup_modifiers/intern/cycles/kernel/osl/nodes/node_hsv.osl branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_hsv.h branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_normal.h branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCarbon.cpp branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemX11.cpp branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCarbon.cpp branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowX11.cpp branches/vgroup_modifiers/intern/smoke/intern/smoke_API.cpp branches/vgroup_modifiers/release/datafiles/blender_icons.png branches/vgroup_modifiers/release/plugins/sequence/color-correction-hsv.c branches/vgroup_modifiers/release/plugins/sequence/color-correction-yuv.c branches/vgroup_modifiers/release/plugins/sequence/dnr.c branches/vgroup_modifiers/release/plugins/sequence/gamma.c branches/vgroup_modifiers/release/scripts/modules/bpy/utils.py branches/vgroup_modifiers/release/scripts/modules/sys_info.py branches/vgroup_modifiers/release/scripts/presets/ffmpeg/DV.py branches/vgroup_modifiers/release/scripts/presets/ffmpeg/DVD.py branches/vgroup_modifiers/release/scripts/presets/ffmpeg/SVCD.py branches/vgroup_modifiers/release/scripts/presets/ffmpeg/VCD.py branches/vgroup_modifiers/release/scripts/startup/bl_operators/presets.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object_constraint.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py branches/vgroup_modifiers/source/blender/blenfont/intern/blf_lang.c branches/vgroup_modifiers/source/blender/blenkernel/BKE_array_mallocn.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_colortools.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_global.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_mesh.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_movieclip.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_tracking.h branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c branches/vgroup_modifiers/source/blender/blenkernel/intern/colortools.c branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.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/sequencer.c branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c branches/vgroup_modifiers/source/blender/blenlib/BLI_edgehash.h branches/vgroup_modifiers/source/blender/blenlib/BLI_math_color.h branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_color.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c branches/vgroup_modifiers/source/blender/blenlib/intern/storage.c branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c branches/vgroup_modifiers/source/blender/collada/MeshImporter.cpp branches/vgroup_modifiers/source/blender/editors/curve/curve_intern.h branches/vgroup_modifiers/source/blender/editors/curve/curve_ops.c branches/vgroup_modifiers/source/blender/editors/curve/editfont.c branches/vgroup_modifiers/source/blender/editors/datafiles/blender_icons.png.c branches/vgroup_modifiers/source/blender/editors/include/BIF_glutil.h branches/vgroup_modifiers/source/blender/editors/include/ED_view3d.h branches/vgroup_modifiers/source/blender/editors/include/UI_icons.h branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_lib.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_mods.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c branches/vgroup_modifiers/source/blender/editors/object/object_bake.c branches/vgroup_modifiers/source/blender/editors/object/object_constraint.c branches/vgroup_modifiers/source/blender/editors/object/object_intern.h branches/vgroup_modifiers/source/blender/editors/object/object_ops.c branches/vgroup_modifiers/source/blender/editors/physics/physics_fluid.c 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/screen/glutil.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_utils.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/space_clip/clip_draw.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_editor.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_graph_draw.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_graph_ops.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_intern.h branches/vgroup_modifiers/source/blender/editors/space_clip/clip_ops.c branches/vgroup_modifiers/source/blender/editors/space_clip/clip_utils.c 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_image/image_buttons.c branches/vgroup_modifiers/source/blender/editors/space_node/space_node.c branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c branches/vgroup_modifiers/source/blender/editors/transform/transform.c branches/vgroup_modifiers/source/blender/editors/transform/transform.h branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c branches/vgroup_modifiers/source/blender/editors/transform/transform_generics.c branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_buffers.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_shader_material.glsl branches/vgroup_modifiers/source/blender/gpu/intern/gpu_shader_material.glsl.c branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf_types.h branches/vgroup_modifiers/source/blender/imbuf/intern/divers.c branches/vgroup_modifiers/source/blender/makesdna/DNA_ID.h branches/vgroup_modifiers/source/blender/makesdna/DNA_action_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_actuator_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_anim_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_armature_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_boid_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_brush_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_camera_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_cloth_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_color_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_constraint_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_controller_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_curve_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_customdata_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_defs.h branches/vgroup_modifiers/source/blender/makesdna/DNA_documentation.h branches/vgroup_modifiers/source/blender/makesdna/DNA_dynamicpaint_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_effect_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_fileglobal_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_genfile.h branches/vgroup_modifiers/source/blender/makesdna/DNA_gpencil_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_group_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_image_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_lamp_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_lattice_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_listBase.h branches/vgroup_modifiers/source/blender/makesdna/DNA_material_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_mesh_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_meshdata_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_meta_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_movieclip_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_nla_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_object_fluidsim.h branches/vgroup_modifiers/source/blender/makesdna/DNA_object_force.h branches/vgroup_modifiers/source/blender/makesdna/DNA_object_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_outliner_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_packedFile_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_particle_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_property_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_screen_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_sdna_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_sensor_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_sequence_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_smoke_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_sound_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_space_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_speaker_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_text_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_texture_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_tracking_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_userdef_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_vec_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_vfont_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_view2d_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_view3d_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_windowmanager_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_world_types.h branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h branches/vgroup_modifiers/source/blender/makesrna/intern/rna_constraint.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_image.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_tracking.c branches/vgroup_modifiers/source/blender/modifiers/CMakeLists.txt branches/vgroup_modifiers/source/blender/modifiers/MOD_modifiertypes.h branches/vgroup_modifiers/source/blender/modifiers/SConscript branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_dynamicpaint.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.c branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_dynamic.c branches/vgroup_modifiers/source/blender/python/SConscript branches/vgroup_modifiers/source/blender/python/generic/bpy_internal_import.c branches/vgroup_modifiers/source/blender/python/intern/CMakeLists.txt branches/vgroup_modifiers/source/blender/python/intern/bpy.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app_handlers.c branches/vgroup_modifiers/source/blender/python/intern/bpy_driver.c branches/vgroup_modifiers/source/blender/python/intern/bpy_interface.c branches/vgroup_modifiers/source/blender/python/intern/bpy_interface_atexit.c branches/vgroup_modifiers/source/blender/python/intern/bpy_intern_string.c branches/vgroup_modifiers/source/blender/python/intern/bpy_library.c branches/vgroup_modifiers/source/blender/python/intern/bpy_operator.c branches/vgroup_modifiers/source/blender/python/intern/bpy_operator_wrap.c branches/vgroup_modifiers/source/blender/python/intern/bpy_props.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_anim.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_array.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_callback.c branches/vgroup_modifiers/source/blender/python/intern/bpy_traceback.c branches/vgroup_modifiers/source/blender/python/intern/bpy_util.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Color.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Euler.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.h branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Quaternion.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_export.m branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_import.m branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_export.c branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_import.c branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c 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/Converter/BL_BlenderDataConversion.cpp branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp branches/vgroup_modifiers/source/gameengine/Converter/KX_IpoConvert.cpp branches/vgroup_modifiers/source/gameengine/Expressions/InputParser.cpp branches/vgroup_modifiers/source/gameengine/Expressions/Operator1Expr.cpp branches/vgroup_modifiers/source/gameengine/Expressions/Operator2Expr.cpp branches/vgroup_modifiers/source/gameengine/Expressions/PyObjectPlus.h branches/vgroup_modifiers/source/gameengine/Expressions/StringValue.h branches/vgroup_modifiers/source/gameengine/Expressions/Value.cpp branches/vgroup_modifiers/source/gameengine/Expressions/Value.h branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_ISensor.cpp branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_RandomActuator.cpp branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp branches/vgroup_modifiers/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Material.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Texture.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Dome.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MeshProxy.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_TouchSensor.cpp Added Paths: ----------- branches/vgroup_modifiers/intern/cycles/app/io_export_cycles_xml.py branches/vgroup_modifiers/intern/dualcon/ branches/vgroup_modifiers/intern/dualcon/CMakeLists.txt branches/vgroup_modifiers/intern/dualcon/SConscript branches/vgroup_modifiers/intern/dualcon/dualcon.h branches/vgroup_modifiers/intern/dualcon/intern/ branches/vgroup_modifiers/intern/dualcon/intern/GeoCommon.h branches/vgroup_modifiers/intern/dualcon/intern/MemoryAllocator.h branches/vgroup_modifiers/intern/dualcon/intern/ModelReader.h branches/vgroup_modifiers/intern/dualcon/intern/Projections.cpp branches/vgroup_modifiers/intern/dualcon/intern/Projections.h branches/vgroup_modifiers/intern/dualcon/intern/Queue.h branches/vgroup_modifiers/intern/dualcon/intern/cubes.h branches/vgroup_modifiers/intern/dualcon/intern/dualcon_c_api.cpp branches/vgroup_modifiers/intern/dualcon/intern/manifold_table.cpp branches/vgroup_modifiers/intern/dualcon/intern/manifold_table.h branches/vgroup_modifiers/intern/dualcon/intern/marching_cubes_table.cpp branches/vgroup_modifiers/intern/dualcon/intern/marching_cubes_table.h branches/vgroup_modifiers/intern/dualcon/intern/octree.cpp branches/vgroup_modifiers/intern/dualcon/intern/octree.h branches/vgroup_modifiers/intern/dualcon/intern/readme.txt branches/vgroup_modifiers/release/scripts/presets/tracking_track_color/object.py branches/vgroup_modifiers/source/blender/blenlib/BLI_array.h branches/vgroup_modifiers/source/blender/blenlib/intern/math_color_inline.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_remesh.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app_ffmpeg.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app_ffmpeg.h Removed Paths: ------------- branches/vgroup_modifiers/intern/dualcon/CMakeLists.txt branches/vgroup_modifiers/intern/dualcon/SConscript branches/vgroup_modifiers/intern/dualcon/dualcon.h branches/vgroup_modifiers/intern/dualcon/intern/ branches/vgroup_modifiers/intern/dualcon/intern/GeoCommon.h branches/vgroup_modifiers/intern/dualcon/intern/MemoryAllocator.h branches/vgroup_modifiers/intern/dualcon/intern/ModelReader.h branches/vgroup_modifiers/intern/dualcon/intern/Projections.cpp branches/vgroup_modifiers/intern/dualcon/intern/Projections.h branches/vgroup_modifiers/intern/dualcon/intern/Queue.h branches/vgroup_modifiers/intern/dualcon/intern/cubes.h branches/vgroup_modifiers/intern/dualcon/intern/dualcon_c_api.cpp branches/vgroup_modifiers/intern/dualcon/intern/manifold_table.cpp branches/vgroup_modifiers/intern/dualcon/intern/manifold_table.h branches/vgroup_modifiers/intern/dualcon/intern/marching_cubes_table.cpp branches/vgroup_modifiers/intern/dualcon/intern/marching_cubes_table.h branches/vgroup_modifiers/intern/dualcon/intern/octree.cpp branches/vgroup_modifiers/intern/dualcon/intern/octree.h branches/vgroup_modifiers/intern/dualcon/intern/readme.txt Property Changed: ---------------- branches/vgroup_modifiers/ branches/vgroup_modifiers/source/blender/editors/space_outliner/ Property changes on: branches/vgroup_modifiers ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42864 + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998 /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 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43015 Modified: branches/vgroup_modifiers/CMakeLists.txt =================================================================== --- branches/vgroup_modifiers/CMakeLists.txt 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/CMakeLists.txt 2011-12-31 10:46:30 UTC (rev 43031) @@ -660,7 +660,7 @@ if(WITH_OPENAL) set(OPENAL ${LIBDIR}/openal) set(OPENAL_INCLUDE_DIR ${OPENAL}/include) - set(OPENAL_LIBRARY wrap_oal) + set(OPENAL_LIBRARY OpenAL32) set(OPENAL_LIBPATH ${OPENAL}/lib) endif() @@ -765,22 +765,27 @@ ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include ${LIBDIR}/opencollada/include/GeneratedSaxParser/include ) + + set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib") set(OPENCOLLADA_LIBRARIES - ${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib - ${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib - ${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib - ${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib - ${LIBDIR}/opencollada/lib/MathMLSolver.lib - ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib - ${LIBDIR}/opencollada/lib/xml2.lib - ${LIBDIR}/opencollada/lib/buffer.lib - ${LIBDIR}/opencollada/lib/ftoa.lib - ${LIBDIR}/opencollada/lib/UTF.lib + ${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib + ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib + ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib + ${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib + ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib + ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib + ${OPENCOLLADA_LIBPATH}/xml2.lib + ${OPENCOLLADA_LIBPATH}/buffer.lib + ${OPENCOLLADA_LIBPATH}/ftoa.lib + ${OPENCOLLADA_LIBPATH}/UTF.lib ) set(PCRE_LIBRARIES - ${LIBDIR}/opencollada/lib/pcre.lib + ${OPENCOLLADA_LIBPATH}/pcre.lib ) + + unset(OPENCOLLADA_LIBPATH) + endif() if(WITH_CODEC_FFMPEG) @@ -798,18 +803,8 @@ endif() if(WITH_IMAGE_OPENEXR) - if(MSVC90) - set(MSVC_LIB _vs2008) - set(MSVC_INC) - elseif(MSVC10) - set(MSVC_LIB _vs2010) - set(MSVC_INC _vs2010) - else() - set(MSVC_LIB msvc) - set(MSVC_INC) - endif() - set(OPENEXR ${LIBDIR}/openexr) - set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB}) + set_lib_path(OPENEXR "openexr") + set_lib_path(OPENEXR_LIBPATH "openexr/lib") set(OPENEXR_LIBRARIES ${OPENEXR_LIBPATH}/Iex.lib ${OPENEXR_LIBPATH}/Half.lib @@ -817,7 +812,7 @@ ${OPENEXR_LIBPATH}/Imath.lib ${OPENEXR_LIBPATH}/IlmThread.lib ) - set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC}) + set_lib_path(OPENEXR_INCUDE "openexr/include") set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCUDE} ${OPENEXR_INCUDE}/IlmImf @@ -844,9 +839,9 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_VERSION 3.2) # CACHE STRING) - set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH) - set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH) - + set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}") + set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH) + # uncached vars set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}") @@ -879,7 +874,7 @@ set(OPENIMAGEIO ${LIBDIR}/openimageio) set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include) set(OPENIMAGEIO_LIBRARIES OpenImageIO) - set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) + set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib") set(OPENIMAGEIO_DEFINITIONS) endif() @@ -1431,11 +1426,9 @@ if(MSVC10) if(WITH_IMAGE_OPENEXR) message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008") - set(WITH_IMAGE_OPENEXR OFF) endif() if(WITH_OPENCOLLADA) message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008") - set(WITH_OPENCOLLADA OFF) endif() endif() Modified: branches/vgroup_modifiers/SConstruct =================================================================== --- branches/vgroup_modifiers/SConstruct 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/SConstruct 2011-12-31 10:46:30 UTC (rev 43031) @@ -756,7 +756,6 @@ if env['WITH_BF_OPENAL']: dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') - dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') if env['WITH_BF_SNDFILE']: dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') Modified: branches/vgroup_modifiers/build_files/cmake/macros.cmake =================================================================== --- branches/vgroup_modifiers/build_files/cmake/macros.cmake 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/cmake/macros.cmake 2011-12-31 10:46:30 UTC (rev 43031) @@ -665,3 +665,16 @@ endif() endfunction() +macro(set_lib_path + lvar + lproj) + + + if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj}) + set(${lvar} ${LIBDIR}/vc2010/${lproj}) + else() + set(${lvar} ${LIBDIR}/${lproj}) + endif() + + +endmacro() \ No newline at end of file Modified: branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py 2011-12-31 10:46:30 UTC (rev 43031) @@ -13,7 +13,7 @@ WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' -BF_OPENAL_LIB = 'OpenAL32 wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' Modified: branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py 2011-12-31 10:46:30 UTC (rev 43031) @@ -14,7 +14,7 @@ WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' -BF_OPENAL_LIB = 'wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = True @@ -156,15 +156,15 @@ WITH_BF_OIIO = True BF_OIIO = LIBDIR + '/gcc/openimageio' -BF_OIIO_INC = '#../lib/windows/gcc/openimageio/include' +BF_OIIO_INC = BF_OIIO + '/include' BF_OIIO_LIB = 'OpenImageIO' -BF_OIIO_LIBPATH = '#../lib/windows/gcc/openimageio/lib' +BF_OIIO_LIBPATH = BF_OIIO + '/lib' WITH_BF_BOOST = True BF_BOOST = LIBDIR + '/boost' -BF_BOOST_INC = '#../lib/windows/boost/include' +BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_LIB = 'boost_date_time-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47' -BF_BOOST_LIBPATH = '#../lib/windows/boost/lib/gcc' +BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc' #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True Modified: branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py 2011-12-31 10:46:30 UTC (rev 43031) @@ -20,7 +20,7 @@ WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' -BF_OPENAL_LIB = 'wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_ICONV = True Modified: branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py 2011-12-31 10:46:30 UTC (rev 43031) @@ -20,7 +20,7 @@ WITH_BF_OPENAL = True BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ' -BF_OPENAL_LIB = 'wrap_oal' +BF_OPENAL_LIB = 'OpenAL32' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_SNDFILE = True Modified: branches/vgroup_modifiers/build_files/scons/tools/btools.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/tools/btools.py 2011-12-31 10:46:21 UTC (rev 43030) +++ branches/vgroup_modifiers/build_files/scons/tools/btools.py 2011-12-31 10:46:30 UTC (rev 43031) @@ -159,7 +159,8 @@ 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC', 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH', - 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH' + 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH', + 'WITH_BF_LIBMV' ] # Have options here that scons expects to be lists Modified: branches/vgroup_modifiers/extern/CMakeLists.txt @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs