[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58771] branches/soc-2013-dingto: Merged revision(s) 58682-58770 from trunk/blender into soc-2013-dingto.

Thomas Dinges blender at dingto.org
Wed Jul 31 20:14:19 CEST 2013


Revision: 58771
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58771
Author:   dingto
Date:     2013-07-31 18:14:18 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Merged revision(s) 58682-58770 from trunk/blender into soc-2013-dingto. 

Modified Paths:
--------------
    branches/soc-2013-dingto/doc/python_api/rst/bge.render.rst
    branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
    branches/soc-2013-dingto/extern/libmv/libmv-capi.h
    branches/soc-2013-dingto/extern/libmv/libmv-capi_stub.cc
    branches/soc-2013-dingto/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-dingto/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-dingto/intern/cycles/bvh/bvh.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-dingto/intern/ghost/GHOST_C-api.h
    branches/soc-2013-dingto/intern/ghost/GHOST_IWindow.h
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_Window.h
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-dingto/release/scripts/templates_py/custom_nodes.py
    branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/key.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/material.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-dingto/source/blender/blenlib/BLI_array.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2013-dingto/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/string.c
    branches/soc-2013-dingto/source/blender/bmesh/CMakeLists.txt
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_connect_pair.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_fill_holes.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_triangulate.c
    branches/soc-2013-dingto/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2013-dingto/source/blender/collada/DocumentImporter.cpp
    branches/soc-2013-dingto/source/blender/collada/SkinInfo.cpp
    branches/soc-2013-dingto/source/blender/collada/TransformReader.cpp
    branches/soc-2013-dingto/source/blender/collada/collada_internal.cpp
    branches/soc-2013-dingto/source/blender/collada/collada_internal.h
    branches/soc-2013-dingto/source/blender/collada/collada_utils.cpp
    branches/soc-2013-dingto/source/blender/collada/collada_utils.h
    branches/soc-2013-dingto/source/blender/editors/animation/anim_markers.c
    branches/soc-2013-dingto/source/blender/editors/armature/armature_select.c
    branches/soc-2013-dingto/source/blender/editors/armature/pose_select.c
    branches/soc-2013-dingto/source/blender/editors/armature/pose_utils.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_ops.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-dingto/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-dingto/source/blender/editors/mesh/mesh_data.c
    branches/soc-2013-dingto/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-dingto/source/blender/editors/object/object_bake.c
    branches/soc-2013-dingto/source/blender/editors/object/object_edit.c
    branches/soc-2013-dingto/source/blender/editors/object/object_relations.c
    branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
    branches/soc-2013-dingto/source/blender/editors/render/render_preview.c
    branches/soc-2013-dingto/source/blender/editors/render/render_shading.c
    branches/soc-2013-dingto/source/blender/editors/screen/screen_ops.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-dingto/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_image/image_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_relationships.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_select.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_toolbar.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_view.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_color.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2013-dingto/source/blender/nodes/intern/node_common.c
    branches/soc-2013-dingto/source/blender/nodes/intern/node_exec.c
    branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2013-dingto/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2013-dingto/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-dingto/source/blender/windowmanager/WM_api.h
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2013-dingto/source/blender/windowmanager/wm_window.h
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_ICanvas.h

Added Paths:
-----------
    branches/soc-2013-dingto/source/blender/blenlib/BLI_alloca.h
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_connect_nonplanar.c

Property Changed:
----------------
    branches/soc-2013-dingto/
    branches/soc-2013-dingto/source/blender/editors/interface/interface.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
   - /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:57315-57365,57369-58448,58450,58452-58681
   + /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:57315-57365,57369-58448,58450,58452-58770

Modified: branches/soc-2013-dingto/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2013-dingto/doc/python_api/rst/bge.render.rst	2013-07-31 17:30:10 UTC (rev 58770)
+++ branches/soc-2013-dingto/doc/python_api/rst/bge.render.rst	2013-07-31 18:14:18 UTC (rev 58771)
@@ -62,7 +62,19 @@
 .. data:: KX_BLENDER_GLSL_MATERIAL
 
    Materials approximating blender materials with GLSL.
+   
+.. DATA:: VSYNC_OFF
 
+   Disables vsync
+
+.. DATA:: VSYNC_ON
+
+   Enables vsync
+
+.. DATA:: VSYNC_ADAPTIVE
+
+   Enables adaptive vsync if supported. Adaptive vsync enables vsync if the framerate is above the monitors refresh rate. Otherwise, vsync is diabled if the framerate is too low.
+
 *********
 Functions
 *********
@@ -289,3 +301,15 @@
 
    Disable the motion blur effect.
 
+.. function:: setVsync(value)
+
+   Set the vsync value
+
+   :arg value: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE
+   :type value: integer
+
+.. function:: getVsync()
+
+   Get the current vsync value
+
+   :rtype: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE

Modified: branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-dingto/extern/libmv/libmv-capi.cc	2013-07-31 17:30:10 UTC (rev 58770)
+++ branches/soc-2013-dingto/extern/libmv/libmv-capi.cc	2013-07-31 18:14:18 UTC (rev 58771)
@@ -62,7 +62,7 @@
 #  define snprintf _snprintf
 #endif
 
-typedef struct libmv_Reconstruction {
+struct libmv_Reconstruction {
 	libmv::EuclideanReconstruction reconstruction;
 
 	/* used for per-track average error calculation after reconstruction */
@@ -70,12 +70,12 @@
 	libmv::CameraIntrinsics intrinsics;
 
 	double error;
-} libmv_Reconstruction;
+};
 
-typedef struct libmv_Features {
+struct libmv_Features {
 	int count, margin;
 	libmv::Feature *features;
-} libmv_Features;
+};
 
 /* ************ Logging ************ */
 
@@ -197,30 +197,30 @@
 	int x, y;
 	png_bytep *row_pointers;
 
-	row_pointers= (png_bytep*)malloc(sizeof(png_bytep)*image.Height());
+	row_pointers = (png_bytep *) malloc(sizeof(png_bytep) * image.Height());
 
 	for (y = 0; y < image.Height(); y++) {
-		row_pointers[y]= (png_bytep)malloc(sizeof(png_byte)*4*image.Width());
+		row_pointers[y] = (png_bytep) malloc(sizeof(png_byte) * 4 * image.Width());
 
 		for (x = 0; x < image.Width(); x++) {
 			if (x0 == x && image.Height() - y0 - 1 == y) {
-				row_pointers[y][x*4+0]= 255;
-				row_pointers[y][x*4+1]= 0;
-				row_pointers[y][x*4+2]= 0;
-				row_pointers[y][x*4+3]= 255;
+				row_pointers[y][x * 4 + 0] = 255;
+				row_pointers[y][x * 4 + 1] = 0;
+				row_pointers[y][x * 4 + 2] = 0;
+				row_pointers[y][x * 4 + 3] = 255;
 			}
 			else {
 				float pixel = image(image.Height() - y - 1, x, 0);
-				row_pointers[y][x*4+0]= pixel*255;
-				row_pointers[y][x*4+1]= pixel*255;
-				row_pointers[y][x*4+2]= pixel*255;
-				row_pointers[y][x*4+3]= 255;
+				row_pointers[y][x * 4 + 0] = pixel * 255;
+				row_pointers[y][x * 4 + 1] = pixel * 255;
+				row_pointers[y][x * 4 + 2] = pixel * 255;
+				row_pointers[y][x * 4 + 3] = 255;
 			}
 		}
 	}
 
 	{
-		static int a= 0;
+		static int a = 0;
 		char buf[128];
 		snprintf(buf, sizeof(buf), "%s_%02d.png", prefix, ++a);
 		savePNGImage(row_pointers, image.Width(), image.Height(), 8, PNG_COLOR_TYPE_RGBA, buf);
@@ -237,17 +237,17 @@
 	int x, y;
 	png_bytep *row_pointers;
 
-	row_pointers= (png_bytep*)malloc(sizeof(png_bytep)*height);
+	row_pointers = (png_bytep *) malloc(sizeof(png_bytep) * height);
 
 	for (y = 0; y < height; y++) {
-		row_pointers[y]= (png_bytep)malloc(sizeof(png_byte)*4*width);
+		row_pointers[y] = (png_bytep) malloc(sizeof(png_byte) * 4 * width);
 
 		for (x = 0; x < width; x++) {
-			char pixel = data[width*y+x];
-			row_pointers[y][x*4+0]= pixel;
-			row_pointers[y][x*4+1]= pixel;
-			row_pointers[y][x*4+2]= pixel;
-			row_pointers[y][x*4+3]= 255;
+			char pixel = data[width * y + x];
+			row_pointers[y][x * 4 + 0] = pixel;
+			row_pointers[y][x * 4 + 1] = pixel;
+			row_pointers[y][x * 4 + 2] = pixel;
+			row_pointers[y][x * 4 + 3] = 255;
 		}
 	}
 
@@ -267,12 +267,12 @@
 
 /* ************ Planar tracker ************ */
 
-/* TrackRegion (new planar tracker) */
-int libmv_trackRegion(const struct libmv_trackRegionOptions *options,
+/* TrackRegion */
+int libmv_trackRegion(const libmv_TrackRegionOptions *options,
                       const float *image1, int image1_width, int image1_height,
                       const float *image2, int image2_width, int image2_height,
                       const double *x1, const double *y1,
-                      struct libmv_trackRegionResult *result,
+                      libmv_TrackRegionResult *result,
                       double *x2, double *y2)
 {
 	double xx1[5], yy1[5];
@@ -292,7 +292,7 @@
 
 	switch (options->motion_model) {
 #define LIBMV_CONVERT(the_model) \
-    case libmv::TrackRegionOptions::the_model: \
+	case libmv::TrackRegionOptions::the_model: \
 		track_region_options.mode = libmv::TrackRegionOptions::the_model; \
 		break;
 		LIBMV_CONVERT(TRANSLATION)
@@ -384,29 +384,28 @@
 
 /* ************ Tracks ************ */
 
-libmv_Tracks *libmv_tracksNew(void)
+struct libmv_Tracks *libmv_tracksNew(void)
 {
 	libmv::Tracks *libmv_tracks = new libmv::Tracks();
 
-	return (libmv_Tracks *)libmv_tracks;
+	return (struct libmv_Tracks *)libmv_tracks;
 }
 
-void libmv_tracksInsert(struct libmv_Tracks *libmv_tracks, int image, int track, double x, double y)
+void libmv_tracksDestroy(struct libmv_Tracks *libmv_tracks)
 {
-	((libmv::Tracks*)libmv_tracks)->Insert(image, track, x, y);
+	delete (libmv::Tracks*) libmv_tracks;
 }
 
-void libmv_tracksDestroy(libmv_Tracks *libmv_tracks)
+void libmv_tracksInsert(struct libmv_Tracks *libmv_tracks, int image, int track, double x, double y)
 {
-	delete (libmv::Tracks*)libmv_tracks;
+	((libmv::Tracks*) libmv_tracks)->Insert(image, track, x, y);
 }
 
-/* ************ Reconstruction solver ************ */
+/* ************ Reconstruction ************ */
 
 class ReconstructUpdateCallback : public libmv::ProgressUpdateCallback {
 public:
-	ReconstructUpdateCallback(reconstruct_progress_update_cb progress_update_callback,
-			void *callback_customdata)
+	ReconstructUpdateCallback(reconstruct_progress_update_cb progress_update_callback, void *callback_customdata)
 	{
 		progress_update_callback_ = progress_update_callback;
 		callback_customdata_ = callback_customdata;
@@ -414,7 +413,7 @@
 
 	void invoke(double progress, const char *message)
 	{
-		if(progress_update_callback_) {
+		if (progress_update_callback_) {
 			progress_update_callback_(callback_customdata_, progress, message);
 		}
 	}
@@ -456,7 +455,7 @@
 	                                       intrinsics);
 }
 
-static void cameraIntrinsicsFromOptions(const libmv_cameraIntrinsicsOptions *camera_intrinsics_options,
+static void cameraIntrinsicsFromOptions(const libmv_CameraIntrinsicsOptions *camera_intrinsics_options,
                                         libmv::CameraIntrinsics *camera_intrinsics)
 {
 	camera_intrinsics->SetFocalLength(camera_intrinsics_options->focal_length,
@@ -486,7 +485,7 @@
 }
 
 static void finishReconstruction(const libmv::Tracks &tracks, const libmv::CameraIntrinsics &camera_intrinsics,
-                                 libmv_Reconstruction *libmv_reconstruction,
+                                 struct libmv_Reconstruction *libmv_reconstruction,
                                  reconstruct_progress_update_cb progress_update_callback,
                                  void *callback_customdata)
 {
@@ -571,13 +570,13 @@
 	return true;
 }
 
-libmv_Reconstruction *libmv_solveReconstruction(const libmv_Tracks *libmv_tracks,
-			const libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
-			libmv_reconstructionOptions *libmv_reconstruction_options,
-			reconstruct_progress_update_cb progress_update_callback,
-			void *callback_customdata)
+struct libmv_Reconstruction *libmv_solveReconstruction(const struct libmv_Tracks *libmv_tracks,
+		const libmv_CameraIntrinsicsOptions *libmv_camera_intrinsics_options,
+		libmv_ReconstructionOptions *libmv_reconstruction_options,
+		reconstruct_progress_update_cb progress_update_callback,
+		void *callback_customdata)
 {
-	libmv_Reconstruction *libmv_reconstruction = new libmv_Reconstruction();
+	struct libmv_Reconstruction *libmv_reconstruction = new libmv_Reconstruction();
 
 	libmv::Tracks &tracks = *((libmv::Tracks *) libmv_tracks);
 	libmv::EuclideanReconstruction &reconstruction = libmv_reconstruction->reconstruction;
@@ -650,16 +649,16 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list