[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38547] branches/soc-2011-salad: Merging r38534 through r38546 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Wed Jul 20 22:34:40 CEST 2011
Revision: 38547
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38547
Author: nazgul
Date: 2011-07-20 20:34:40 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
Merging r38534 through r38546 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38534
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38546
Modified Paths:
--------------
branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
branches/soc-2011-salad/extern/libmv/libmv-capi.h
branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/editors/include/ED_transform.h
branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
Added Paths:
-----------
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py
Removed Paths:
-------------
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py
branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38533
/trunk/blender:36834-38516
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38546
/trunk/blender:36834-38516
Modified: branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/soc-2011-salad/extern/libmv/libmv-capi.cpp 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/extern/libmv/libmv-capi.cpp 2011-07-20 20:34:40 UTC (rev 38547)
@@ -450,3 +450,19 @@
intrinsics.ApplyIntrinsics(x, y, x1, y1);
}
}
+
+void libmv_InvertIntrinsics(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
+ double x, double y, double *x1, double *y1)
+{
+ libmv::CameraIntrinsics intrinsics;
+
+ intrinsics.SetFocalLength(focal_length, focal_length);
+ intrinsics.SetPrincipalPoint(principal_x, principal_y);
+ intrinsics.SetRadialDistortion(k1, k2, k3);
+
+ if(focal_length) {
+ /* do a lens distortion if focal length is non-zero only */
+
+ intrinsics.InvertIntrinsics(x, y, x1, y1);
+ }
+}
Modified: branches/soc-2011-salad/extern/libmv/libmv-capi.h
===================================================================
--- branches/soc-2011-salad/extern/libmv/libmv-capi.h 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/extern/libmv/libmv-capi.h 2011-07-20 20:34:40 UTC (rev 38547)
@@ -72,6 +72,8 @@
/* utils */
void libmv_applyCameraIntrinsics(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
double x, double y, double *x1, double *y1);
+void libmv_InvertIntrinsics(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
+ double x, double y, double *x1, double *y1);
#ifdef __cplusplus
}
Deleted: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/default.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -1,5 +0,0 @@
-import bpy
-track = bpy.context.edit_movieclip.tracking.active_track
-
-track.color = (0.0, 0.0, 0.0)
-track.use_custom_color = False
Copied: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py (from rev 38546, branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/default.py)
===================================================================
--- branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py (rev 0)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/default.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -0,0 +1,5 @@
+import bpy
+track = bpy.context.edit_movieclip.tracking.active_track
+
+track.color = (0.0, 0.0, 0.0)
+track.use_custom_color = False
Deleted: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/far_plane.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -1,5 +0,0 @@
-import bpy
-track = bpy.context.edit_movieclip.tracking.active_track
-
-track.color = (0.0, 0.0, 1.0)
-track.use_custom_color = True
Copied: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py (from rev 38546, branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/far_plane.py)
===================================================================
--- branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py (rev 0)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/far_plane.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -0,0 +1,5 @@
+import bpy
+track = bpy.context.edit_movieclip.tracking.active_track
+
+track.color = (0.0, 0.0, 1.0)
+track.use_custom_color = True
Deleted: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/near_plane.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -1,5 +0,0 @@
-import bpy
-track = bpy.context.edit_movieclip.tracking.active_track
-
-track.color = (0.0, 1.0, 0.0)
-track.use_custom_color = True
Copied: branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py (from rev 38546, branches/soc-2011-tomato/release/scripts/presets/tracking_track_color/near_plane.py)
===================================================================
--- branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py (rev 0)
+++ branches/soc-2011-salad/release/scripts/presets/tracking_track_color/near_plane.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -0,0 +1,5 @@
+import bpy
+track = bpy.context.edit_movieclip.tracking.active_track
+
+track.color = (0.0, 1.0, 0.0)
+track.use_custom_color = True
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -318,6 +318,24 @@
preset_subdir = "tracking_camera"
+class AddPresetTrackingTrackColor(AddPresetBase, bpy.types.Operator):
+ '''Add a Clip Track Color Preset'''
+ bl_idname = "clip.track_color_preset_add"
+ bl_label = "Add Track Color Preset"
+ preset_menu = "CLIP_MT_track_color_presets"
+
+ preset_defines = [
+ "track = bpy.context.edit_movieclip.tracking.active_track"
+ ]
+
+ preset_values = [
+ "track.color",
+ "track.use_custom_color"
+ ]
+
+ preset_subdir = "tracking_track_color"
+
+
class AddPresetKeyconfig(AddPresetBase, bpy.types.Operator):
'''Add a Keyconfig Preset'''
bl_idname = "wm.keyconfig_preset_add"
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -214,6 +214,18 @@
layout.prop(act_track, "name")
layout.prop(act_track, "locked")
+ row = layout.row(align=True)
+ label = bpy.types.CLIP_MT_track_color_presets.bl_label
+ row.menu('CLIP_MT_track_color_presets', text=label)
+ row.operator("clip.track_color_preset_add", text="", icon="ZOOMIN")
+ op = row.operator("clip.track_color_preset_add", text="", icon="ZOOMOUT")
+ op.remove_active = True
+
+ row = layout.row()
+ row.prop(act_track, "use_custom_color")
+ if act_track.use_custom_color:
+ row.prop(act_track, "color", text="")
+
layout.template_track(sc, "scopes")
row = layout.row()
@@ -320,7 +332,10 @@
row.prop(sc, "show_disabled", text="Disabled")
row.prop(sc, "show_bundles", text="Bundles")
- layout.prop(sc, "show_names", text="Names")
+ row = layout.row()
+ row.prop(sc, "show_names", text="Names")
+ row.prop(sc, "show_grid", text="Grid")
+
layout.prop(sc, "show_tiny_markers", text="Tiny Markers")
layout.prop(sc, "lock_selection")
@@ -521,5 +536,12 @@
draw = bpy.types.Menu.draw_preset
+class CLIP_MT_track_color_presets(bpy.types.Menu):
+ bl_label = "Color Presets"
+ preset_subdir = "tracking_track_color"
+ preset_operator = "script.execute_preset"
+ draw = bpy.types.Menu.draw_preset
+
+
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py 2011-07-20 20:34:40 UTC (rev 38547)
@@ -2185,11 +2185,12 @@
layout.separator()
layout.prop(view, "show_reconstruction")
- sub = layout.column()
- sub.active = view.show_reconstruction
- sub.prop(view, "bundle_size")
- sub.prop(view, "show_bundle_name")
- sub.prop(view, "show_camera_path")
+ if view.show_reconstruction:
+ layout.label(text="Bundle type:")
+ layout.prop(view, "bundle_draw_type", text="")
+ layout.prop(view, "bundle_draw_size")
+ layout.prop(view, "show_bundle_name")
+ layout.prop(view, "show_camera_path")
layout.separator()
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h 2011-07-20 20:31:25 UTC (rev 38546)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h 2011-07-20 20:34:40 UTC (rev 38547)
@@ -79,6 +79,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list