[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45693] branches/soc-2011-tomato: Merging r45620 through r45692 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Apr 16 14:47:35 CEST 2012
Revision: 45693
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45693
Author: nazgul
Date: 2012-04-16 12:47:34 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Merging r45620 through r45692 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45620
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45692
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/cmake/project_info.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_mbvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_passes.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_qbvh.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_mapping.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/render/buffers.cpp
branches/soc-2011-tomato/intern/cycles/render/camera.cpp
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/cycles/subd/subd_dice.cpp
branches/soc-2011-tomato/intern/cycles/subd/subd_split.cpp
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
branches/soc-2011-tomato/intern/cycles/util/util_transform.h
branches/soc-2011-tomato/intern/dualcon/intern/Projections.h
branches/soc-2011-tomato/intern/dualcon/intern/dualcon_c_api.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-tomato/release/freedesktop/blender.desktop
branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/avi/intern/options.c
branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/SConscript
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_winstuff.h
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/runtime.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/include/ED_curve.h
branches/soc-2011-tomato/source/blender/editors/include/ED_uvedit.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_outliner/SConscript
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/util/SConscript
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_boid.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/render/SConscript
branches/soc-2011-tomato/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/presets/fluid/
branches/soc-2011-tomato/release/scripts/presets/fluid/honey.py
branches/soc-2011-tomato/release/scripts/presets/fluid/oil.py
branches/soc-2011-tomato/release/scripts/presets/fluid/water.py
branches/soc-2011-tomato/source/tools/uncrustify.cfg
Removed Paths:
-------------
branches/soc-2011-tomato/release/scripts/presets/fluid/honey.py
branches/soc-2011-tomato/release/scripts/presets/fluid/oil.py
branches/soc-2011-tomato/release/scripts/presets/fluid/water.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45619
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45692
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-04-16 12:47:34 UTC (rev 45693)
@@ -153,7 +153,7 @@
else()
set(PLATFORM_DEFAULT OFF)
endif()
-option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" PLATFORM_DEFAULT)
+option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ${PLATFORM_DEFAULT})
unset(PLATFORM_DEFAULT)
@@ -194,7 +194,14 @@
option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
+if(MINGW)
+ set(PLATFORM_DEFAULT ON)
+else()
+ set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
+
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
if(APPLE OR (WIN32 AND NOT UNIX))
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
@@ -357,6 +364,19 @@
set(WITH_GHOST_XDND OFF)
endif()
+if(MINGW)
+ if(WITH_CODEC_QUICKTIME)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+ endif()
+
+ if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
+ message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
+ "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
+ endif()
+endif()
+
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/SConstruct 2012-04-16 12:47:34 UTC (rev 45693)
@@ -251,6 +251,7 @@
target_env_defs['WITH_BF_REDCODE'] = False
target_env_defs['WITH_BF_DDS'] = False
target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_FRAMESERVER'] = False
target_env_defs['WITH_BF_HDR'] = False
target_env_defs['WITH_BF_ZLIB'] = False
target_env_defs['WITH_BF_SDL'] = False
@@ -261,6 +262,7 @@
target_env_defs['BF_BUILDINFO'] = False
target_env_defs['WITH_BF_FLUID'] = False
target_env_defs['WITH_BF_OCEANSIM'] = False
+ target_env_defs['WITH_BF_SMOKE'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_REMESH'] = False
Modified: branches/soc-2011-tomato/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/project_info.py 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/build_files/cmake/project_info.py 2012-04-16 12:47:34 UTC (rev 45693)
@@ -231,8 +231,13 @@
return fallback
import subprocess
- info = subprocess.Popen(["svn", "info", path],
- stdout=subprocess.PIPE).communicate()[0]
+ try:
+ info = subprocess.Popen(["svn", "info", path],
+ stdout=subprocess.PIPE).communicate()[0]
+ except:
+ # possibly 'svn' isnt found/installed
+ return fallback
+
# string version, we only want the URL
info = info.decode(encoding="utf-8", errors="ignore")
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-04-16 12:47:34 UTC (rev 45693)
@@ -107,6 +107,7 @@
'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'BF_FFMPEG_DLL',
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
+ 'WITH_BF_FRAMESERVER',
'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -154,6 +155,7 @@
'WITH_BF_BOOLEAN',
'WITH_BF_REMESH',
'WITH_BF_OCEANSIM',
+ 'WITH_BF_SMOKE',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH',
@@ -264,6 +266,7 @@
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
(BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
(BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
+ (BoolVariable('WITH_BF_SMOKE', 'Build with smoke simulation', True)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
('BF_OPENAL', 'Base path for OpenAL', ''),
@@ -311,6 +314,8 @@
(BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)),
(BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)),
+
+ (BoolVariable('WITH_BF_FRAMESERVER', 'Support export to a frameserver', True)),
(BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)),
('BF_FFMPEG', 'FFMPEG base path', ''),
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-04-16 12:47:34 UTC (rev 45693)
@@ -724,7 +724,7 @@
LinearQuadPatch *bpatch = new LinearQuadPatch();
for(int i = 0; i < 4; i++)
- P[i] = transform(&state.tfm, P[i]);
+ P[i] = transform_point(&state.tfm, P[i]);
memcpy(bpatch->hull, &P[0], sizeof(bpatch->hull));
patch = bpatch;
@@ -738,7 +738,7 @@
BicubicPatch *bpatch = new BicubicPatch();
for(int i = 0; i < 16; i++)
- P[i] = transform(&state.tfm, P[i]);
+ P[i] = transform_point(&state.tfm, P[i]);
memcpy(bpatch->hull, &P[0], sizeof(bpatch->hull));
patch = bpatch;
@@ -777,7 +777,7 @@
Light *light = new Light();
light->shader = state.shader;
xml_read_float3(&light->co, node, "P");
- light->co = transform(&state.tfm, light->co);
+ light->co = transform_point(&state.tfm, light->co);
state.scene->lights.push_back(light);
}
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h 2012-04-16 12:47:34 UTC (rev 45693)
@@ -59,7 +59,7 @@
{
Transform tfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
- *P = transform(&tfm, ray->P);
+ *P = transform_point(&tfm, ray->P);
float3 dir = transform_direction(&tfm, ray->D);
@@ -351,7 +351,7 @@
if(isect->object != ~0) {
Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_INVERSE_TRANSFORM);
- P = transform(&tfm, P);
+ P = transform_point(&tfm, P);
D = transform_direction(&tfm, D*t);
D = normalize_len(D, &t);
}
@@ -367,7 +367,7 @@
if(isect->object != ~0) {
Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_TRANSFORM);
- P = transform(&tfm, P);
+ P = transform_point(&tfm, P);
}
return P;
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h 2012-04-16 11:57:22 UTC (rev 45692)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h 2012-04-16 12:47:34 UTC (rev 45693)
@@ -39,7 +39,7 @@
{
/* create ray form raster position */
Transform rastertocamera = kernel_data.cam.rastertocamera;
- float3 Pcamera = transform(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
+ float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
ray->P = make_float3(0.0f, 0.0f, 0.0f);
ray->D = Pcamera;
@@ -63,7 +63,7 @@
/* transform ray from camera to world */
Transform cameratoworld = kernel_data.cam.cameratoworld;
- ray->P = transform(&cameratoworld, ray->P);
+ ray->P = transform_point(&cameratoworld, ray->P);
ray->D = transform_direction(&cameratoworld, ray->D);
ray->D = normalize(ray->D);
@@ -93,7 +93,7 @@
{
/* create ray form raster position */
Transform rastertocamera = kernel_data.cam.rastertocamera;
- float3 Pcamera = transform(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
+ float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
ray->P = Pcamera;
ray->D = make_float3(0.0f, 0.0f, 1.0f);
@@ -101,7 +101,7 @@
/* transform ray from camera to world */
Transform cameratoworld = kernel_data.cam.cameratoworld;
- ray->P = transform(&cameratoworld, ray->P);
+ ray->P = transform_point(&cameratoworld, ray->P);
ray->D = transform_direction(&cameratoworld, ray->D);
ray->D = normalize(ray->D);
@@ -127,7 +127,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list