[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41447] branches/soc-2011-tomato: Tomato: camera sensor changes
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Nov 1 19:39:07 CET 2011
Revision: 41447
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41447
Author: blendix
Date: 2011-11-01 18:39:07 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Tomato: camera sensor changes
* Rename "FOV Mode" to "Sensor Fit"
* Add sensor height back in presets, default to Horizontal fit for all presets
except Blender, which uses Automatic.
* Some UI tweaks
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/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.cpp
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-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/APS-C_DSLR.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Blender.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 32
+bpy.context.object.data.sensor_height = 18
+bpy.context.object.data.sensor_fit = 'AUTO'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1100D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.2
+bpy.context.object.data.sensor_height = 14.7
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 27.9
+bpy.context.object.data.sensor_height = 18.6
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_1DS.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 36.0
+bpy.context.object.data.sensor_height = 24.0
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_500D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_550D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_5D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 36.0
+bpy.context.object.data.sensor_height = 24.0
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_600D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_60D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Canon_7D.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 22.3
+bpy.context.object.data.sensor_height = 14.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D300S.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.6
+bpy.context.object.data.sensor_height = 15.8
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3100.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.1
+bpy.context.object.data.sensor_height = 15.4
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D35.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 36.0
+bpy.context.object.data.sensor_height = 23.9
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5000.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.6
+bpy.context.object.data.sensor_height = 15.8
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D5100.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.6
+bpy.context.object.data.sensor_height = 15.6
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D7000.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.6
+bpy.context.object.data.sensor_height = 15.6
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D90.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 23.6
+bpy.context.object.data.sensor_height = 15.8
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py 2011-11-01 18:27:09 UTC (rev 41446)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Red_Epic.py 2011-11-01 18:39:07 UTC (rev 41447)
@@ -1,2 +1,4 @@
import bpy
bpy.context.object.data.sensor_width = 30.0
+bpy.context.object.data.sensor_height = 15.0
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Red_One_2K.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list