[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39215] branches/soc-2011-tomato: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Tue Aug 9 17:12:21 CEST 2011
Revision: 39215
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39215
Author: nazgul
Date: 2011-08-09 15:12:20 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================
Changes into sensor size use case.
There was problem with vertical sensor size which can't actually
affect on things due to we've got fixed image resolution. So
as soon horizontal size gets defined, both of sensor height
and vertical FOV is known and exposing it into UI makes things
difficult to understand.
That's why vertical sensor size was dropped.
Also added pixel aspect to camera settings fo clip editor.
Solver will sue this value rather than value from display
aspect ratio.
This pixel aspect would be copied to render settings after solving
so things should match now between footage, solving anf footage.
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/presets/camera/APS-C_DSLR.py
branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py
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/camera/full_frame_35mm_film.py
branches/soc-2011-tomato/release/scripts/presets/camera/micro_four_thirds.py
branches/soc-2011-tomato/release/scripts/presets/camera/super_16_film.py
branches/soc-2011-tomato/release/scripts/presets/camera/super_35_film.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Blender.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
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/APS-C_DSLR.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/APS-C_DSLR.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/APS-C_DSLR.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 32
-bpy.context.object.data.sensor_y = 18
+bpy.context.object.data.sensor_width = 32
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.2
-bpy.context.object.data.sensor_y = 14.7
+bpy.context.object.data.sensor_width = 22.2
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 27.9
-bpy.context.object.data.sensor_y = 18.6
+bpy.context.object.data.sensor_width = 27.9
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 36.0
-bpy.context.object.data.sensor_y = 24.0
+bpy.context.object.data.sensor_width = 36.0
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 36.0
-bpy.context.object.data.sensor_y = 24.0
+bpy.context.object.data.sensor_width = 36.0
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 22.3
-bpy.context.object.data.sensor_y = 14.9
+bpy.context.object.data.sensor_width = 22.3
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.6
-bpy.context.object.data.sensor_y = 15.8
+bpy.context.object.data.sensor_width = 23.6
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.1
-bpy.context.object.data.sensor_y = 15.4
+bpy.context.object.data.sensor_width = 23.1
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 36.0
-bpy.context.object.data.sensor_y = 23.9
+bpy.context.object.data.sensor_width = 36.0
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.6
-bpy.context.object.data.sensor_y = 15.8
+bpy.context.object.data.sensor_width = 23.6
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.6
-bpy.context.object.data.sensor_y = 15.6
+bpy.context.object.data.sensor_width = 23.6
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.6
-bpy.context.object.data.sensor_y = 15.6
+bpy.context.object.data.sensor_width = 23.6
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 23.6
-bpy.context.object.data.sensor_y = 15.8
+bpy.context.object.data.sensor_width = 23.6
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 30.0
-bpy.context.object.data.sensor_y = 15.0
+bpy.context.object.data.sensor_width = 30.0
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py 2011-08-09 14:50:40 UTC (rev 39214)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py 2011-08-09 15:12:20 UTC (rev 39215)
@@ -1,3 +1,2 @@
import bpy
-bpy.context.object.data.sensor_x = 11.1
-bpy.context.object.data.sensor_y = 6.24
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list