[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39027] branches/soc-2011-tomato: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Thu Aug 4 18:06:25 CEST 2011
Revision: 39027
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39027
Author: nazgul
Date: 2011-08-04 16:06:24 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Request from Sebastian/Francois: default lens
for clip set to 24.0
- Added some additional camera presets from Francois request.
Not sure all things from GENERIC section of that request
would be actually useful.
Probably the whole sensor size workflow would be changed...
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py
branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py
branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py
branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_3K.py
branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_4K.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_500D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_550D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_5D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_600D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_60D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_7D.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Red_Epic.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Red_One_4K.py
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.2
+bpy.context.object.data.sensor_y = 14.7
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 27.9
+bpy.context.object.data.sensor_y = 18.6
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 24.0
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 24.0
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.1
+bpy.context.object.data.sensor_y = 15.4
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 23.9
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.6
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.6
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 30.0
+bpy.context.object.data.sensor_y = 15.0
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 11.1
+bpy.context.object.data.sensor_y = 6.24
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_3K.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_3K.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_3K.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 16.65
+bpy.context.object.data.sensor_y = 9.36
Added: branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_4K.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_4K.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_4K.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.2
+bpy.context.object.data.sensor_y = 12.6
Added: branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1100D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1100D.py (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1100D.py 2011-08-04 16:06:24 UTC (rev 39027)
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.2
+camera.sensor_height = 14.7
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
Added: branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Canon_1D.py (rev 0)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list