Revision: 47692
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47692
Author: nazgul
Date: 2012-06-10 16:26:00 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Merging r47683 through r47690 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47683
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47690
Modified Paths:
--------------
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47683
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47690
Modified:
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
===================================================================
---
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
2012-06-10 16:22:58 UTC (rev 47691)
+++
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
2012-06-10 16:26:00 UTC (rev 47692)
@@ -136,6 +136,7 @@
// and T must be the same, otherwise callers' assumptions about use
// of this code will be broken.
struct InnerContainer {
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
T element;
};
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
2012-06-10 16:22:58 UTC (rev 47691)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
2012-06-10 16:26:00 UTC (rev 47692)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 10
+#define BLENDER_SUBVERSION 11
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-06-10 16:22:58 UTC (rev 47691)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-06-10 16:26:00 UTC (rev 47692)
@@ -1248,6 +1248,7 @@
ImBuf *search_ibuf,
MovieTrackingMarker *marker,
int num_samples_x, int num_samples_y,
float pos[2])
{
+#ifdef WITH_LIBMV
ImBuf *pattern_ibuf;
double src_pixel_x[5], src_pixel_y[5];
double warped_position_x, warped_position_y;
@@ -1272,6 +1273,27 @@
}
return pattern_ibuf;
+#else
+ ImBuf *pattern_ibuf;
+
+ /* real sampling requires libmv, but areas are supposing pattern would
be
+ * sampled if search area does exists, so we'll need to create empty
+ * pattern area here to prevent adding NULL-checks all over just to deal
+ * with situation when lubmv is disabled
+ */
+
+ (void) frame_width;
+ (void) frame_height;
+ (void) search_ibuf;
+ (void) marker;
+
+ pattern_ibuf = IMB_allocImBuf(num_samples_x, num_samples_y, 32,
IB_rectfloat);
+
+ pos[0] = num_samples_x / 2.0f;
+ pos[1] = num_samples_y / 2.0f;
+
+ return pattern_ibuf;
+#endif
}
ImBuf *BKE_tracking_get_pattern_imbuf(ImBuf *ibuf, MovieTrackingTrack *track,
MovieTrackingMarker *marker,
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-06-10 16:22:58 UTC (rev 47691)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-06-10 16:26:00 UTC (rev 47692)
@@ -6117,7 +6117,7 @@
reconstruction->cameras = newdataadr(fd, reconstruction->cameras);
}
-static void direct_link_movieTracks(FileData *fd, MovieClip *clip, ListBase
*tracksbase)
+static void direct_link_movieTracks(FileData *fd, ListBase *tracksbase)
{
MovieTrackingTrack *track;
@@ -6125,7 +6125,6 @@
for (track = tracksbase->first; track; track = track->next) {
track->markers = newdataadr(fd, track->markers);
- track->gpd = newlibadr_us(fd, clip->id.lib, track->gpd);
}
}
@@ -6142,7 +6141,7 @@
if (fd->movieclipmap) clip->tracking.camera.intrinsics =
newmclipadr(fd, clip->tracking.camera.intrinsics);
else clip->tracking.camera.intrinsics = NULL;
- direct_link_movieTracks(fd, clip, &tracking->tracks);
+ direct_link_movieTracks(fd, &tracking->tracks);
direct_link_movieReconstruction(fd, &tracking->reconstruction);
clip->tracking.act_track = newdataadr(fd, clip->tracking.act_track);
@@ -6161,22 +6160,40 @@
link_list(fd, &tracking->objects);
for (object = tracking->objects.first; object; object = object->next) {
- direct_link_movieTracks(fd, clip, &object->tracks);
+ direct_link_movieTracks(fd, &object->tracks);
direct_link_movieReconstruction(fd, &object->reconstruction);
}
}
+static void lib_link_movieTracks(FileData *fd, MovieClip *clip, ListBase
*tracksbase)
+{
+ MovieTrackingTrack *track;
+
+ for (track = tracksbase->first; track; track = track->next) {
+ track->gpd = newlibadr_us(fd, clip->id.lib, track->gpd);
+ }
+}
+
static void lib_link_movieclip(FileData *fd, Main *main)
{
MovieClip *clip;
for (clip = main->movieclip.first; clip; clip = clip->id.next) {
if (clip->id.flag & LIB_NEEDLINK) {
+ MovieTracking *tracking = &clip->tracking;
+ MovieTrackingObject *object;
+
if (clip->adt)
lib_link_animdata(fd, &clip->id, clip->adt);
clip->gpd = newlibadr_us(fd, clip->id.lib, clip->gpd);
+ lib_link_movieTracks(fd, clip, &tracking->tracks);
+
+ for (object = tracking->objects.first; object; object =
object->next) {
+ lib_link_movieTracks(fd, clip, &object->tracks);
+ }
+
clip->id.flag -= LIB_NEEDLINK;
}
}
@@ -7683,7 +7700,7 @@
}
}
- {
+ if (main->versionfile < 263 || (main->versionfile == 263 &&
main->subversionfile < 11)) {
MovieClip *clip;
for (clip = main->movieclip.first; clip; clip = clip->id.next) {
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
2012-06-10 16:22:58 UTC (rev 47691)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
2012-06-10 16:26:00 UTC (rev 47692)
@@ -2889,7 +2889,6 @@
write_windowmanagers(wd, &mainvar->wm);
write_screens (wd, &mainvar->screen);
}
- write_gpencils (wd, &mainvar->gpencil);
write_movieclips (wd, &mainvar->movieclip);
write_masks (wd, &mainvar->mask);
write_scenes (wd, &mainvar->scene);
@@ -2916,6 +2915,7 @@
write_nodetrees(wd, &mainvar->nodetree);
write_brushes (wd, &mainvar->brush);
write_scripts (wd, &mainvar->script);
+ write_gpencils (wd, &mainvar->gpencil);
write_libraries(wd, mainvar->next);
if (write_user_block) {
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47683
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47690
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-47683
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-47690
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
2012-06-10 16:22:58 UTC (rev 47691)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
2012-06-10 16:26:00 UTC (rev 47692)
@@ -1071,7 +1071,7 @@
SC_DOPE_SORT_INVERSE = (1 << 0),
} eSpaceClip_Dopesheet_Flag;
-/* SPaceClip->gpencil_src */
+/* SpaceClip->gpencil_src */
typedef enum eSpaceClip_GPencil_Source {
SC_GPENCIL_SRC_CLIP = 0,
SC_GPENCIL_SRC_TRACK = 1,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
