Revision: 58800
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58800
Author: gdh
Date: 2013-08-01 01:41:25 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58745 to r58799.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58745
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58799
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc
branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.h
branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_object.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_light_path.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-cycles_mblur/intern/cycles/render/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/render/graph.h
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.h
branches/soc-2013-cycles_mblur/intern/cycles/render/shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/shader.h
branches/soc-2013-cycles_mblur/intern/cycles/render/svm.cpp
branches/soc-2013-cycles_mblur/intern/ghost/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/ghost/SConscript
branches/soc-2013-cycles_mblur/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_bake.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_sound_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/nodes/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_shader.h
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_static_types.h
branches/soc-2013-cycles_mblur/source/blender/nodes/intern/node_common.c
branches/soc-2013-cycles_mblur/source/blender/nodes/intern/node_exec.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.h
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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:57388-58744
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58799
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc 2013-08-01
00:34:03 UTC (rev 58799)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc 2013-08-01
01:41:25 UTC (rev 58800)
@@ -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 @@
finishReconstruction(tracks, camera_intrinsics, libmv_reconstruction,
progress_update_callback, callback_customdata);
- return (libmv_Reconstruction *)libmv_reconstruction;
+ return (struct libmv_Reconstruction *)libmv_reconstruction;
}
-struct libmv_Reconstruction *libmv_solveModal(const libmv_Tracks *libmv_tracks,
- const libmv_cameraIntrinsicsOptions
*libmv_camera_intrinsics_options,
- const libmv_reconstructionOptions
*libmv_reconstruction_options,
- reconstruct_progress_update_cb progress_update_callback,
- void *callback_customdata)
+struct libmv_Reconstruction *libmv_solveModal(const struct libmv_Tracks
*libmv_tracks,
+ const libmv_CameraIntrinsicsOptions
*libmv_camera_intrinsics_options,
+ const libmv_ReconstructionOptions *libmv_reconstruction_options,
+ reconstruct_progress_update_cb progress_update_callback,
+ void *callback_customdata)
{
- libmv_Reconstruction *libmv_reconstruction = new libmv_Reconstruction();
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
