[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45711] branches/smoke2: Merge trunk rev 45664-45710
Daniel Genrich
daniel.genrich at gmx.net
Tue Apr 17 14:14:17 CEST 2012
Revision: 45711
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45711
Author: genscher
Date: 2012-04-17 12:14:16 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Merge trunk rev 45664-45710
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45664
Modified Paths:
--------------
branches/smoke2/intern/cycles/app/cycles_xml.cpp
branches/smoke2/intern/cycles/kernel/kernel_bvh.h
branches/smoke2/intern/cycles/kernel/kernel_camera.h
branches/smoke2/intern/cycles/kernel/kernel_mbvh.h
branches/smoke2/intern/cycles/kernel/kernel_object.h
branches/smoke2/intern/cycles/kernel/kernel_passes.h
branches/smoke2/intern/cycles/kernel/kernel_path.h
branches/smoke2/intern/cycles/kernel/kernel_qbvh.h
branches/smoke2/intern/cycles/kernel/svm/svm_camera.h
branches/smoke2/intern/cycles/kernel/svm/svm_mapping.h
branches/smoke2/intern/cycles/kernel/svm/svm_tex_coord.h
branches/smoke2/intern/cycles/render/buffers.cpp
branches/smoke2/intern/cycles/render/camera.cpp
branches/smoke2/intern/cycles/render/light.cpp
branches/smoke2/intern/cycles/render/object.cpp
branches/smoke2/intern/cycles/subd/subd_dice.cpp
branches/smoke2/intern/cycles/subd/subd_split.cpp
branches/smoke2/intern/cycles/util/util_boundbox.h
branches/smoke2/intern/cycles/util/util_transform.h
branches/smoke2/intern/dualcon/intern/Projections.h
branches/smoke2/intern/dualcon/intern/dualcon_c_api.cpp
branches/smoke2/release/freedesktop/blender.desktop
branches/smoke2/release/scripts/startup/bl_operators/presets.py
branches/smoke2/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/smoke2/release/scripts/startup/bl_operators/wm.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
branches/smoke2/source/blender/blenfont/intern/blf_font.c
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_multires.h
branches/smoke2/source/blender/blenkernel/intern/DerivedMesh.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/displist.c
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/navmesh_conversion.c
branches/smoke2/source/blender/blenkernel/intern/node.c
branches/smoke2/source/blender/blenlib/BLI_math_vector.h
branches/smoke2/source/blender/blenlib/BLI_scanfill.h
branches/smoke2/source/blender/blenlib/BLI_threads.h
branches/smoke2/source/blender/blenlib/intern/math_base_inline.c
branches/smoke2/source/blender/blenlib/intern/math_vector_inline.c
branches/smoke2/source/blender/blenlib/intern/scanfill.c
branches/smoke2/source/blender/blenlib/intern/storage.c
branches/smoke2/source/blender/blenlib/intern/threads.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators_private.h
branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.c
branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
branches/smoke2/source/blender/bmesh/operators/bmo_mirror.c
branches/smoke2/source/blender/bmesh/operators/bmo_removedoubles.c
branches/smoke2/source/blender/bmesh/operators/bmo_slide.c
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/include/ED_curve.h
branches/smoke2/source/blender/editors/mesh/CMakeLists.txt
branches/smoke2/source/blender/editors/mesh/editmesh_bvh.c
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_slide.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/editmesh_utils.c
branches/smoke2/source/blender/editors/mesh/mesh_navmesh.c
branches/smoke2/source/blender/editors/physics/physics_fluid.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/sound/sound_ops.c
branches/smoke2/source/blender/editors/space_node/node_edit.c
branches/smoke2/source/blender/editors/space_node/node_intern.h
branches/smoke2/source/blender/editors/transform/transform_snap.c
branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
branches/smoke2/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/smoke2/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/smoke2/source/blender/imbuf/intern/thumbs.c
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_object_fluidsim.h
branches/smoke2/source/blender/makesrna/intern/rna_fluidsim.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_remesh.c
branches/smoke2/source/blender/nodes/composite/node_composite_tree.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_image.c
branches/smoke2/source/blender/windowmanager/intern/wm_files.c
branches/smoke2/source/blender/windowmanager/intern/wm_gesture.c
branches/smoke2/source/blender/windowmanager/intern/wm_init_exit.c
branches/smoke2/source/blender/windowmanager/intern/wm_keymap.c
branches/smoke2/source/creator/creator.c
branches/smoke2/source/gameengine/Ketsji/KX_NavMeshObject.cpp
Added Paths:
-----------
branches/smoke2/release/scripts/presets/fluid/
branches/smoke2/release/scripts/templates/operator_file_export.py
branches/smoke2/release/scripts/templates/operator_file_import.py
branches/smoke2/source/blender/editors/mesh/editmesh_rip.c
Removed Paths:
-------------
branches/smoke2/release/scripts/templates/operator_export.py
Property Changed:
----------------
branches/smoke2/
Property changes on: branches/smoke2
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:45664-45710
Modified: branches/smoke2/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/smoke2/intern/cycles/app/cycles_xml.cpp 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/app/cycles_xml.cpp 2012-04-17 12:14:16 UTC (rev 45711)
@@ -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/smoke2/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_bvh.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_bvh.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -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/smoke2/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_camera.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_camera.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -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 @@
__device void camera_sample_environment(KernelGlobals *kg, float raster_x, float raster_y, Ray *ray)
{
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));
/* create ray form raster position */
ray->P = make_float3(0.0, 0.0f, 0.0f);
@@ -136,7 +136,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);
@@ -145,10 +145,10 @@
ray->dP.dx = make_float3(0.0f, 0.0f, 0.0f);
ray->dP.dy = make_float3(0.0f, 0.0f, 0.0f);
- Pcamera = transform(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f));
+ Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f));
ray->dD.dx = normalize(transform_direction(&cameratoworld, equirectangular_to_direction(Pcamera.x, Pcamera.y))) - ray->D;
- Pcamera = transform(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f));
+ Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f));
ray->dD.dy = normalize(transform_direction(&cameratoworld, equirectangular_to_direction(Pcamera.x, Pcamera.y))) - ray->D;
#endif
Modified: branches/smoke2/intern/cycles/kernel/kernel_mbvh.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_mbvh.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_mbvh.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -61,7 +61,7 @@
{
Transform tfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
- ray->P = transform(&tfm, ray->origP);
+ ray->P = transform_point(&tfm, ray->origP);
float3 dir = ray->origD;
Modified: branches/smoke2/intern/cycles/kernel/kernel_object.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_object.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_object.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -42,7 +42,7 @@
__device_inline void object_position_transform(KernelGlobals *kg, int object, float3 *P)
{
Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
- *P = transform(&tfm, *P);
+ *P = transform_point(&tfm, *P);
}
__device_inline void object_normal_transform(KernelGlobals *kg, int object, float3 *N)
Modified: branches/smoke2/intern/cycles/kernel/kernel_passes.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_passes.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_passes.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -53,7 +53,7 @@
if(sample == 0) {
if(flag & PASS_DEPTH) {
Transform tfm = kernel_data.cam.worldtocamera;
- float depth = len(transform(&tfm, sd->P));
+ float depth = len(transform_point(&tfm, sd->P));
kernel_write_pass_float(buffer + kernel_data.film.pass_depth, sample, depth);
}
Modified: branches/smoke2/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_path.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_path.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -147,14 +147,14 @@
__device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *ray, float3 *shadow)
{
+ *shadow = make_float3(1.0f, 1.0f, 1.0f);
+
if(ray->t == 0.0f)
return false;
Intersection isect;
bool result = scene_intersect(kg, ray, PATH_RAY_SHADOW_OPAQUE, &isect);
- *shadow = make_float3(1.0f, 1.0f, 1.0f);
-
#ifdef __TRANSPARENT_SHADOWS__
if(result && kernel_data.integrator.transparent_shadows) {
/* transparent shadows work in such a way to try to minimize overhead
Modified: branches/smoke2/intern/cycles/kernel/kernel_qbvh.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_qbvh.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/kernel_qbvh.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -50,7 +50,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);
@@ -384,7 +384,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);
}
@@ -400,7 +400,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/smoke2/intern/cycles/kernel/svm/svm_camera.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/svm/svm_camera.h 2012-04-17 11:02:32 UTC (rev 45710)
+++ branches/smoke2/intern/cycles/kernel/svm/svm_camera.h 2012-04-17 12:14:16 UTC (rev 45711)
@@ -25,7 +25,7 @@
float3 vector;
Transform tfm = kernel_data.cam.worldtocamera;
- vector = transform(&tfm, sd->P);
+ vector = transform_point(&tfm, sd->P);
zdepth = vector.z;
distance = len(vector);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list