[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41651] branches/cycles: Cycles: svn merge -r41627:41650 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Nov 8 13:33:18 CET 2011
Revision: 41651
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41651
Author: blendix
Date: 2011-11-08 12:33:17 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Cycles: svn merge -r41627:41650 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41627
Modified Paths:
--------------
branches/cycles/doc/python_api/examples/bpy.app.handlers.1.py
branches/cycles/doc/python_api/examples/bpy.app.handlers.py
branches/cycles/extern/libmv/CMakeLists.txt
branches/cycles/extern/libmv/SConscript
branches/cycles/extern/libmv/bundle.sh
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/cycles/extern/libmv/patches/mingw.patch
branches/cycles/extern/libmv/third_party/glog/src/config.h
branches/cycles/extern/libmv/third_party/glog/src/utilities.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/port.h
branches/cycles/intern/cycles/blender/blender_shader.cpp
branches/cycles/release/scripts/modules/bpy/ops.py
branches/cycles/release/scripts/modules/bpyml_ui.py
branches/cycles/release/scripts/startup/bl_operators/clip.py
branches/cycles/release/scripts/startup/bl_operators/object_quick_effects.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_camera.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/cycles/release/scripts/startup/bl_ui/properties_game.py
branches/cycles/release/scripts/startup/bl_ui/properties_material.py
branches/cycles/release/scripts/startup/bl_ui/properties_object.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/cycles/release/scripts/startup/bl_ui/properties_render.py
branches/cycles/release/scripts/startup/bl_ui/space_clip.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_node.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/intern/movieclip.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/editors/armature/reeb.c
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/interface/CMakeLists.txt
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/interface_widgets.c
branches/cycles/source/blender/editors/space_clip/tracking_ops.c
branches/cycles/source/blender/editors/space_image/space_image.c
branches/cycles/source/blender/editors/space_node/CMakeLists.txt
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/editors/space_node/node_buttons.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_header.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/imbuf/intern/anim_movie.c
branches/cycles/source/blender/makesdna/DNA_modifier_types.h
branches/cycles/source/blender/makesrna/intern/rna_movieclip.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree_types.h
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_tracking.c
branches/cycles/source/blender/nodes/CMakeLists.txt
branches/cycles/source/blender/nodes/NOD_shader.h
branches/cycles/source/blender/nodes/composite/node_composite_tree.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/cycles/source/blender/nodes/shader/node_shader_tree.c
branches/cycles/source/blender/nodes/shader/node_shader_util.c
branches/cycles/source/blender/nodes/shader/node_shader_util.h
branches/cycles/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_background.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/cycles/source/blender/nodes/texture/node_texture_tree.c
branches/cycles/source/blender/render/intern/source/occlusion.c
branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/cycles/source/blender/editors/space_node/node_templates.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
Removed Paths:
-------------
branches/cycles/source/blender/editors/interface/interface_node.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_texture.c
Property Changed:
----------------
branches/cycles/
branches/cycles/extern/libmv/CMakeLists.txt
branches/cycles/extern/libmv/SConscript
branches/cycles/extern/libmv/bundle.sh
branches/cycles/extern/libmv/files.txt
branches/cycles/extern/libmv/libmv/base/id_generator.h
branches/cycles/extern/libmv/libmv/base/scoped_ptr.h
branches/cycles/extern/libmv/libmv/base/vector.h
branches/cycles/extern/libmv/libmv/base/vector_utils.h
branches/cycles/extern/libmv/libmv/image/array_nd.h
branches/cycles/extern/libmv/libmv/image/convolve.h
branches/cycles/extern/libmv/libmv/image/image.h
branches/cycles/extern/libmv/libmv/image/sample.h
branches/cycles/extern/libmv/libmv/image/tuple.h
branches/cycles/extern/libmv/libmv/logging/logging.h
branches/cycles/extern/libmv/libmv/multiview/conditioning.h
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.h
branches/cycles/extern/libmv/libmv/multiview/fundamental.h
branches/cycles/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/cycles/extern/libmv/libmv/multiview/projection.h
branches/cycles/extern/libmv/libmv/multiview/resection.h
branches/cycles/extern/libmv/libmv/multiview/triangulation.h
branches/cycles/extern/libmv/libmv/numeric/dogleg.h
branches/cycles/extern/libmv/libmv/numeric/function_derivative.h
branches/cycles/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/cycles/extern/libmv/libmv/numeric/numeric.h
branches/cycles/extern/libmv/libmv/numeric/poly.h
branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.h
branches/cycles/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/cycles/extern/libmv/libmv/simple_pipeline/detect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/intersect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/cycles/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/resect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/tracks.h
branches/cycles/extern/libmv/libmv/tracking/klt_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/pyramid_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/retrack_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/sad.h
branches/cycles/extern/libmv/libmv/tracking/trklt_region_tracker.h
branches/cycles/extern/libmv/libmv-capi.cpp
branches/cycles/extern/libmv/libmv-capi.h
branches/cycles/extern/libmv/mkfiles.sh
branches/cycles/extern/libmv/third_party/fast/fast.c
branches/cycles/extern/libmv/third_party/fast/fast.h
branches/cycles/extern/libmv/third_party/fast/fast_10.c
branches/cycles/extern/libmv/third_party/fast/fast_11.c
branches/cycles/extern/libmv/third_party/fast/fast_12.c
branches/cycles/extern/libmv/third_party/fast/fast_9.c
branches/cycles/extern/libmv/third_party/fast/nonmax.c
branches/cycles/extern/libmv/third_party/gflags/config.h
branches/cycles/extern/libmv/third_party/gflags/gflags.h
branches/cycles/extern/libmv/third_party/gflags/gflags_completions.h
branches/cycles/extern/libmv/third_party/gflags/mutex.h
branches/cycles/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/cycles/extern/libmv/third_party/glog/src/base/googleinit.h
branches/cycles/extern/libmv/third_party/glog/src/base/mutex.h
branches/cycles/extern/libmv/third_party/glog/src/config.h
branches/cycles/extern/libmv/third_party/glog/src/config_linux.h
branches/cycles/extern/libmv/third_party/glog/src/config_mac.h
branches/cycles/extern/libmv/third_party/glog/src/demangle.h
branches/cycles/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/cycles/extern/libmv/third_party/glog/src/symbolize.h
branches/cycles/extern/libmv/third_party/glog/src/utilities.h
branches/cycles/extern/libmv/third_party/glog/src/windows/config.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/windows/port.h
branches/cycles/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/cycles/extern/libmv/third_party/ldl/CMakeLists.txt
branches/cycles/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/cycles/extern/libmv/third_party/ldl/Include/ldl.h
branches/cycles/extern/libmv/third_party/ldl/README.txt
branches/cycles/extern/libmv/third_party/ldl/Source/ldl.c
branches/cycles/extern/libmv/third_party/msinttypes/inttypes.h
branches/cycles/extern/libmv/third_party/msinttypes/stdint.h
branches/cycles/extern/libmv/third_party/ssba/COPYING.TXT
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/cycles/extern/libmv/third_party/ssba/README.TXT
branches/cycles/intern/
branches/cycles/release/
branches/cycles/release/scripts/presets/tracking_camera/Blender.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_500D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_550D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_5D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_600D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_60D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_7D.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/cycles/release/scripts/presets/tracking_camera/Red_Epic.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_4K.py
branches/cycles/release/scripts/presets/tracking_track_color/default.py
branches/cycles/release/scripts/presets/tracking_track_color/far_plane.py
branches/cycles/release/scripts/presets/tracking_track_color/near_plane.py
branches/cycles/release/scripts/startup/bl_operators/clip.py
branches/cycles/release/scripts/startup/bl_ui/space_clip.py
branches/cycles/source/blender/blenkernel/BKE_movieclip.h
branches/cycles/source/blender/blenkernel/BKE_tracking.h
branches/cycles/source/blender/blenkernel/intern/movieclip.c
branches/cycles/source/blender/blenkernel/intern/tracking.c
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/include/ED_clip.h
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_clip/CMakeLists.txt
branches/cycles/source/blender/editors/space_clip/SConscript
branches/cycles/source/blender/editors/space_clip/clip_buttons.c
branches/cycles/source/blender/editors/space_clip/clip_draw.c
branches/cycles/source/blender/editors/space_clip/clip_editor.c
branches/cycles/source/blender/editors/space_clip/clip_graph_draw.c
branches/cycles/source/blender/editors/space_clip/clip_graph_ops.c
branches/cycles/source/blender/editors/space_clip/clip_intern.h
branches/cycles/source/blender/editors/space_clip/clip_ops.c
branches/cycles/source/blender/editors/space_clip/clip_toolbar.c
branches/cycles/source/blender/editors/space_clip/clip_utils.c
branches/cycles/source/blender/editors/space_clip/space_clip.c
branches/cycles/source/blender/editors/space_clip/tracking_ops.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/makesdna/DNA_movieclip_types.h
branches/cycles/source/blender/makesdna/DNA_tracking_types.h
branches/cycles/source/blender/makesrna/intern/rna_movieclip.c
branches/cycles/source/blender/makesrna/intern/rna_tracking.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41627
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41650
Modified: branches/cycles/doc/python_api/examples/bpy.app.handlers.1.py
===================================================================
--- branches/cycles/doc/python_api/examples/bpy.app.handlers.1.py 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/doc/python_api/examples/bpy.app.handlers.1.py 2011-11-08 12:33:17 UTC (rev 41651)
@@ -15,6 +15,6 @@
@persistent
def load_handler(dummy):
- print("Load Handler:", bpy.data.filepath)
+ print("Load Handler:", bpy.data.filepath)
bpy.app.handlers.load_post.append(load_handler)
Modified: branches/cycles/doc/python_api/examples/bpy.app.handlers.py
===================================================================
--- branches/cycles/doc/python_api/examples/bpy.app.handlers.py 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/doc/python_api/examples/bpy.app.handlers.py 2011-11-08 12:33:17 UTC (rev 41651)
@@ -6,7 +6,8 @@
import bpy
+
def my_handler(scene):
- print("Frame Change", scene.frame_current)
+ print("Frame Change", scene.frame_current)
-bpy.app.handlers.frame_change_pre.append(my_handler)
\ No newline at end of file
+bpy.app.handlers.frame_change_pre.append(my_handler)
Modified: branches/cycles/extern/libmv/CMakeLists.txt
===================================================================
--- branches/cycles/extern/libmv/CMakeLists.txt 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/extern/libmv/CMakeLists.txt 2011-11-08 12:33:17 UTC (rev 41651)
@@ -25,8 +25,8 @@
set(INC
.
../Eigen3
- ./third_party/ssba
- ./third_party/ldl/Include
+ third_party/ssba
+ third_party/ldl/Include
../colamd/Include
)
@@ -130,7 +130,7 @@
third_party/msinttypes/inttypes.h
)
-IF(WIN32)
+if(WIN32)
list(APPEND SRC
third_party/glog/src/logging.cc
third_party/glog/src/raw_logging.cc
@@ -158,18 +158,23 @@
)
list(APPEND INC
- ./third_party/glog/src/windows
- ./third_party/msinttypes
+ third_party/glog/src/windows
)
- IF(MSVC)
+ if(NOT MINGW)
+ list(APPEND INC
+ third_party/msinttypes
+ )
+ endif()
+
+ if(MSVC)
set(MSVC_OFLAGS O1 O2 Ox)
foreach(FLAG )
string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
endforeach()
- ENDIF(MSVC)
-ELSE(WIN32)
+ endif()
+else(WIN32)
list(APPEND SRC
third_party/glog/src/utilities.cc
third_party/glog/src/symbolize.cc
@@ -201,9 +206,9 @@
)
list(APPEND INC
- ./third_party/glog/src
+ third_party/glog/src
)
-ENDIF(WIN32)
+endif()
add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
Property changes on: branches/cycles/extern/libmv/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/cycles/extern/libmv/SConscript
===================================================================
--- branches/cycles/extern/libmv/SConscript 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/extern/libmv/SConscript 2011-11-08 12:33:17 UTC (rev 41651)
@@ -30,7 +30,9 @@
incs += ' ' + env['BF_ZLIB_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'
+ incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ incs += ' ./third_party/msinttypes'
src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
src += ['./third_party/glog/src/windows/port.cc']
Property changes on: branches/cycles/extern/libmv/SConscript
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/cycles/extern/libmv/bundle.sh
===================================================================
--- branches/cycles/extern/libmv/bundle.sh 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/extern/libmv/bundle.sh 2011-11-08 12:33:17 UTC (rev 41651)
@@ -168,6 +168,16 @@
list(APPEND INC
./third_party/glog/src/windows
+ )
+
+ IF(NOT MINGW)
+ list(APPEND INC
+ ./third_party/msinttypes
+ )
+ ENDIF(MINGW)
+
+ list(APPEND INC
+ ./third_party/glog/src/windows
./third_party/msinttypes
)
@@ -219,7 +229,10 @@
incs += ' ' + env['BF_ZLIB_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog ./third_party/msinttypes'
+ incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
+ incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ incs += ' ./third_party/msinttypes'
${win_src}
src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
src += ['./third_party/glog/src/windows/port.cc']
Property changes on: branches/cycles/extern/libmv/bundle.sh
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/files.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/base/id_generator.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/base/scoped_ptr.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/base/vector.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/base/vector_utils.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/image/array_nd.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/image/convolve.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/image/image.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/image/sample.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/image/tuple.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/logging/logging.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/conditioning.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc 2011-11-08 11:38:16 UTC (rev 41650)
+++ branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc 2011-11-08 12:33:17 UTC (rev 41651)
@@ -32,6 +32,8 @@
namespace libmv {
namespace euclidean_resection {
+typedef unsigned int uint;
+
bool EuclideanResection(const Mat2X &x_camera,
const Mat3X &X_world,
Mat3 *R, Vec3 *t,
Property changes on: branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/fundamental.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/nviewtriangulation.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/projection.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/resection.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/multiview/triangulation.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/numeric/dogleg.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/numeric/function_derivative.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/numeric/levenberg_marquardt.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/numeric/numeric.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/numeric/poly.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.h
___________________________________________________________________
Added: svn:eol-style
+ native
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list