Revision: 43044
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43044
Author: kjym3
Date: 2011-12-31 21:09:26 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43038
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/SConscript
branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cl
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cu
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_normal.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh_displace.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
branches/soc-2008-mxcurioni/intern/smoke/intern/smoke_API.cpp
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-hsv.c
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-yuv.c
branches/soc-2008-mxcurioni/release/plugins/sequence/dnr.c
branches/soc-2008-mxcurioni/release/plugins/sequence/gamma.c
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/sys_info.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/DV.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_array_mallocn.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_edgehash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_boid_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_camera_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_controller_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_defs.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_documentation.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_effect_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_group_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_listBase.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meta_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_nla_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_packedFile_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_property_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sound_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_speaker_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_text_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vec_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2008-mxcurioni/source/blender/python/SConscript
branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator1Expr.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator2Expr.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/StringValue.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/dualcon/
branches/soc-2008-mxcurioni/release/scripts/presets/tracking_track_color/object.py
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_ffmpeg.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_ffmpeg.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:34011-39896,39898-40096,40098-42902
+ /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:34011-39896,39898-40096,40098-43038
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-31 18:05:23 UTC (rev
43043)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-31 21:09:26 UTC (rev
43044)
@@ -169,6 +169,7 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -765,22 +766,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 +804,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 +813,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 +840,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 +875,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 +1427,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()
@@ -1577,6 +1571,7 @@
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
+ info_cfg_option(WITH_MOD_REMESH)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-12-31 18:05:23 UTC (rev
43043)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-12-31 21:09:26 UTC (rev
43044)
@@ -264,6 +264,7 @@
target_env_defs['WITH_BF_OCEANSIM'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
+ target_env_defs['WITH_BF_REMESH'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-12-31
18:05:23 UTC (rev 43043)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-12-31
21:09:26 UTC (rev 43044)
@@ -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/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
2011-12-31 18:05:23 UTC (rev 43043)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
2011-12-31 21:09:26 UTC (rev 43044)
@@ -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/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
2011-12-31 18:05:23 UTC (rev 43043)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
2011-12-31 21:09:26 UTC (rev 43044)
@@ -152,6 +152,7 @@
'WITH_BF_FLUID',
'WITH_BF_DECIMATE',
'WITH_BF_BOOLEAN',
+ 'WITH_BF_REMESH',
'WITH_BF_OCEANSIM',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC',
'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB',
'BF_JEMALLOC_LIB_STATIC',
@@ -261,6 +262,7 @@
(BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)',
True)),
(BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier',
True)),
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
+ (BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
(BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation',
False)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
Modified: branches/soc-2008-mxcurioni/extern/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/CMakeLists.txt 2011-12-31 18:05:23 UTC
(rev 43043)
+++ branches/soc-2008-mxcurioni/extern/CMakeLists.txt 2011-12-31 21:09:26 UTC
(rev 43044)
@@ -45,7 +45,7 @@
endif()
if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
+ add_subdirectory(recastnavigation)
endif()
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
Modified: branches/soc-2008-mxcurioni/intern/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/CMakeLists.txt 2011-12-31 18:05:23 UTC
(rev 43043)
+++ branches/soc-2008-mxcurioni/intern/CMakeLists.txt 2011-12-31 21:09:26 UTC
(rev 43044)
@@ -36,6 +36,10 @@
add_subdirectory(audaspace)
endif()
+if(WITH_MOD_REMESH)
+ add_subdirectory(dualcon)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
Modified: branches/soc-2008-mxcurioni/intern/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/intern/SConscript 2011-12-31 18:05:23 UTC
(rev 43043)
+++ branches/soc-2008-mxcurioni/intern/SConscript 2011-12-31 21:09:26 UTC
(rev 43044)
@@ -22,6 +22,9 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
+if env ['WITH_BF_REMESH']:
+ SConscript(['dualcon/SConscript'])
+
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
Modified:
branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
