Revision: 41609
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41609
Author: nazgul
Date: 2011-11-07 12:50:26 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Camera tracking integration: Final pre-merge code clean-up
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-11-07 12:49:52 UTC (rev
41608)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-11-07 12:50:26 UTC (rev
41609)
@@ -202,7 +202,7 @@
option(WITH_LZO "Enable fast LZO compression (used for pointcache)"
ON)
option(WITH_LZMA "Enable best LZMA compression, (used for
pointcache)" ON)
-# Tracking
+# Camera/motion tracking
option(WITH_LIBMV "Enable libmv structure from motion library" ON)
# Misc
Modified: branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libmv/CMakeLists.txt 2011-11-07
12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/extern/libmv/CMakeLists.txt 2011-11-07
12:50:26 UTC (rev 41609)
@@ -39,7 +39,6 @@
libmv-capi.cpp
libmv/numeric/numeric.cc
libmv/numeric/poly.cc
- libmv/numeric/tinyvector.cc
libmv/simple_pipeline/reconstruction.cc
libmv/simple_pipeline/resect.cc
libmv/simple_pipeline/intersect.cc
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
2011-11-07 12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
2011-11-07 12:50:26 UTC (rev 41609)
@@ -394,15 +394,15 @@
col.prop(sc, "show_marker_search", text="Search")
col.prop(sc, "show_pyramid_levels", text="Pyramid")
- col.prop(sc, "show_track_path", text="Path")
+ col.prop(sc, "show_track_path", text="Track Path")
row = col.row()
row.active = sc.show_track_path
row.prop(sc, "path_length", text="Length")
- col.prop(sc, "show_disabled", text="Disabled")
+ col.prop(sc, "show_disabled", "Disabled Tracks")
col.prop(sc, "show_bundles", text="Bundles")
- col.prop(sc, "show_names", text="Names")
+ col.prop(sc, "show_names", text="Track Names")
col.prop(sc, "show_tiny_markers", text="Tiny Markers")
col.prop(sc, "show_grease_pencil", text="Grease Pencil")
Modified:
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
2011-11-07 12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
2011-11-07 12:50:26 UTC (rev 41609)
@@ -1190,7 +1190,6 @@
/* TODO what to do with vert_r->flag? */
vert_r->bweight = (unsigned char) (ev->bweight*255.0f);
- vert_r->flag= ev->f;
}
static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
2011-11-07 12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
2011-11-07 12:50:26 UTC (rev 41609)
@@ -52,7 +52,7 @@
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_lamp_types.h"
+
#include "DNA_lattice_types.h"
#include "DNA_scene_types.h"
#include "DNA_text_types.h"
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
2011-11-07 12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
2011-11-07 12:50:26 UTC (rev 41609)
@@ -643,7 +643,7 @@
if(!cti)
continue;
- /* special case for FollowTrack -- it doesn't use targets to
define relations */
+ /* special case for camera tracking -- it doesn't use targets
to define relations */
if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK,
CONSTRAINT_TYPE_CAMERASOLVER)) {
if(cti->type==CONSTRAINT_TYPE_FOLLOWTRACK) {
bFollowTrackConstraint *data=
(bFollowTrackConstraint *)con->data;
@@ -2148,7 +2148,7 @@
bConstraintTarget *ct;
if (cti) {
- /* special case for FollowTrack -- it doesn't
use targets to define relations */
+ /* special case for camera tracking -- it
doesn't use targets to define relations */
if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK,
CONSTRAINT_TYPE_CAMERASOLVER)) {
ob->recalc |= OB_RECALC_OB;
}
@@ -2563,8 +2563,8 @@
/* camera's matrix is used to orient reconstructed stuff,
so it should happen tracking-related constraints
recalculation
- when camera is changing */
- if(sce->camera && &sce->camera->id == id && sce->clip) {
+ when camera is changing (sergey) */
+ if(sce->camera && &sce->camera->id == id &&
object_get_movieclip(sce, sce->camera, 1)) {
dag_id_flush_update(sce, &sce->clip->id);
}
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2011-11-07 12:49:52 UTC (rev 41608)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2011-11-07 12:50:26 UTC (rev 41609)
@@ -12323,7 +12323,6 @@
{
{
bScreen *sc;
- Camera *cam;
MovieClip *clip;
for (sc= main->screen.first; sc; sc= sc->id.next) {
@@ -12350,14 +12349,6 @@
}
}
- for(cam= main->camera.first; cam; cam= cam->id.next) {
- if (cam->sensor_x < 0.01)
- cam->sensor_x = DEFAULT_SENSOR_WIDTH;
-
- if (cam->sensor_y < 0.01)
- cam->sensor_y = DEFAULT_SENSOR_HEIGHT;
- }
-
for (clip= main->movieclip.first; clip; clip=
clip->id.next) {
MovieTrackingTrack *track;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
