[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57237] branches/multiview: multiview : merging from github branch
Dalai Felinto
dfelinto at gmail.com
Tue Jun 4 20:04:34 CEST 2013
Revision: 57237
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57237
Author: dfelinto
Date: 2013-06-04 18:04:34 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
multiview : merging from github branch
github: 96a55fbbf14e72378a7b71cd9bbda2d9d0106519
http://github.com/dfelinto/blender/tree/multiview
note: this is trunk/svn revision: 57236
Modified Paths:
--------------
branches/multiview/build_files/scons/config/win32-mingw-config.py
branches/multiview/intern/cycles/blender/blender_curves.cpp
branches/multiview/intern/cycles/blender/blender_mesh.cpp
branches/multiview/intern/cycles/bvh/bvh.cpp
branches/multiview/intern/cycles/kernel/kernel_bvh.h
branches/multiview/intern/cycles/kernel/kernel_camera.h
branches/multiview/intern/cycles/kernel/kernel_curve.h
branches/multiview/intern/cycles/kernel/kernel_emission.h
branches/multiview/intern/cycles/kernel/kernel_light.h
branches/multiview/intern/cycles/kernel/kernel_path.h
branches/multiview/intern/cycles/kernel/kernel_subsurface.h
branches/multiview/intern/cycles/kernel/svm/svm_camera.h
branches/multiview/intern/cycles/kernel/svm/svm_math.h
branches/multiview/intern/cycles/kernel/svm/svm_texture.h
branches/multiview/intern/cycles/kernel/svm/svm_wave.h
branches/multiview/intern/cycles/kernel/svm/svm_wireframe.h
branches/multiview/intern/cycles/render/light.cpp
branches/multiview/intern/cycles/render/mesh.cpp
branches/multiview/intern/cycles/render/object.cpp
branches/multiview/intern/cycles/subd/subd_dice.cpp
branches/multiview/intern/cycles/subd/subd_split.cpp
branches/multiview/intern/cycles/util/util_math.h
branches/multiview/intern/cycles/util/util_system.cpp
branches/multiview/intern/cycles/util/util_transform.h
branches/multiview/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/multiview/release/scripts/startup/bl_ui/space_view3d.py
branches/multiview/source/blender/blenkernel/intern/DerivedMesh.c
branches/multiview/source/blender/blenkernel/intern/subsurf_ccg.c
branches/multiview/source/blender/bmesh/CMakeLists.txt
branches/multiview/source/blender/bmesh/bmesh.h
branches/multiview/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/multiview/source/blender/bmesh/intern/bmesh_opdefines.c
branches/multiview/source/blender/bmesh/intern/bmesh_operator_api.h
branches/multiview/source/blender/bmesh/intern/bmesh_operators.h
branches/multiview/source/blender/bmesh/operators/bmo_bridge.c
branches/multiview/source/blender/bmesh/operators/bmo_dissolve.c
branches/multiview/source/blender/bmesh/operators/bmo_utils.c
branches/multiview/source/blender/bmesh/tools/bmesh_decimate.h
branches/multiview/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/multiview/source/blender/editors/interface/interface_handlers.c
branches/multiview/source/blender/editors/interface/interface_templates.c
branches/multiview/source/blender/editors/mesh/CMakeLists.txt
branches/multiview/source/blender/editors/mesh/editmesh_select.c
branches/multiview/source/blender/editors/mesh/editmesh_tools.c
branches/multiview/source/blender/editors/mesh/mesh_intern.h
branches/multiview/source/blender/editors/mesh/mesh_ops.c
branches/multiview/source/blender/editors/object/object_relations.c
branches/multiview/source/blender/editors/physics/particle_object.c
branches/multiview/source/blender/gpu/intern/gpu_buffers.c
branches/multiview/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/multiview/source/blender/makesdna/DNA_modifier_types.h
branches/multiview/source/blender/makesrna/RNA_enum_types.h
branches/multiview/source/blender/makesrna/intern/rna_mesh.c
branches/multiview/source/blender/makesrna/intern/rna_modifier.c
branches/multiview/source/blender/makesrna/intern/rna_scene.c
branches/multiview/source/blender/makesrna/intern/rna_wm.c
branches/multiview/source/blender/modifiers/intern/MOD_decimate.c
branches/multiview/source/blender/windowmanager/intern/wm_window.c
Added Paths:
-----------
branches/multiview/source/blender/bmesh/tools/bmesh_path.c
branches/multiview/source/blender/bmesh/tools/bmesh_path.h
branches/multiview/source/blender/editors/mesh/editmesh_path.c
Modified: branches/multiview/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/multiview/build_files/scons/config/win32-mingw-config.py 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/build_files/scons/config/win32-mingw-config.py 2013-06-04 18:04:34 UTC (rev 57237)
@@ -78,7 +78,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz_st'
+BF_ZLIB_LIB = 'z'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/multiview/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/multiview/intern/cycles/blender/blender_curves.cpp 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/blender/blender_curves.cpp 2013-06-04 18:04:34 UTC (rev 57237)
@@ -224,7 +224,7 @@
float3 cKey = make_float3(nco[0],nco[1],nco[2]);
cKey = transform_point(&itfm, cKey);
if(step_no > 0)
- curve_length += length(cKey - pcKey);
+ curve_length += len(cKey - pcKey);
CData->curvekey_co.push_back(cKey);
CData->curvekey_time.push_back(curve_length);
pcKey = cKey;
@@ -473,7 +473,7 @@
for( int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
float3 firstxbasis = cross(make_float3(1.0f,0.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]);
- if(length_squared(firstxbasis)!= 0.0f)
+ if(len_squared(firstxbasis)!= 0.0f)
firstxbasis = normalize(firstxbasis);
else
firstxbasis = normalize(cross(make_float3(0.0f,1.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]));
@@ -499,7 +499,7 @@
xbasis = cross(v1,v2);
- if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
+ if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -528,7 +528,7 @@
xbasis = cross(v1,v2);
- if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
+ if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
xbasis = normalize(xbasis);
firstxbasis = xbasis;
}
@@ -586,7 +586,7 @@
for( int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
float3 firstxbasis = cross(make_float3(1.0f,0.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]);
- if(length_squared(firstxbasis)!= 0.0f)
+ if(len_squared(firstxbasis)!= 0.0f)
firstxbasis = normalize(firstxbasis);
else
firstxbasis = normalize(cross(make_float3(0.0f,1.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]));
@@ -613,7 +613,7 @@
xbasis = cross(v1,v2);
- if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
+ if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -643,7 +643,7 @@
xbasis = cross(v1,v2);
- if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
+ if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
xbasis = normalize(xbasis);
firstxbasis = xbasis;
}
Modified: branches/multiview/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/multiview/intern/cycles/blender/blender_mesh.cpp 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/blender/blender_mesh.cpp 2013-06-04 18:04:34 UTC (rev 57237)
@@ -237,8 +237,8 @@
bool smooth = f->use_smooth();
if(n == 4) {
- if(length_squared(cross(mesh->verts[vi[1]] - mesh->verts[vi[0]], mesh->verts[vi[2]] - mesh->verts[vi[0]])) == 0.0f ||
- length_squared(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]])) == 0.0f) {
+ if(len_squared(cross(mesh->verts[vi[1]] - mesh->verts[vi[0]], mesh->verts[vi[2]] - mesh->verts[vi[0]])) == 0.0f ||
+ len_squared(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]])) == 0.0f) {
mesh->add_triangle(vi[0], vi[1], vi[3], shader, smooth);
mesh->add_triangle(vi[2], vi[3], vi[1], shader, smooth);
}
Modified: branches/multiview/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/multiview/intern/cycles/bvh/bvh.cpp 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/bvh/bvh.cpp 2013-06-04 18:04:34 UTC (rev 57237)
@@ -287,7 +287,7 @@
float3 v1 = mesh->curve_keys[k1].co;
float3 d0 = v1 - v0;
- float l = length(d0);
+ float l = len(d0);
/*Plan
*Transform tfm = make_transform(
Modified: branches/multiview/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/multiview/intern/cycles/kernel/kernel_bvh.h 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/kernel/kernel_bvh.h 2013-06-04 18:04:34 UTC (rev 57237)
@@ -64,7 +64,7 @@
float3 dir = transform_direction(&tfm, ray->D);
float len;
- dir = normalize_length(dir, &len);
+ dir = normalize_len(dir, &len);
*idir = bvh_inverse_direction(dir);
@@ -76,7 +76,7 @@
{
if(*t != FLT_MAX) {
Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
- *t *= length(transform_direction(&tfm, 1.0f/(*idir)));
+ *t *= len(transform_direction(&tfm, 1.0f/(*idir)));
}
*P = ray->P;
@@ -94,7 +94,7 @@
float3 dir = transform_direction(&itfm, ray->D);
float len;
- dir = normalize_length(dir, &len);
+ dir = normalize_len(dir, &len);
*idir = bvh_inverse_direction(dir);
@@ -105,7 +105,7 @@
__device_inline void bvh_instance_motion_pop(KernelGlobals *kg, int object, const Ray *ray, float3 *P, float3 *idir, float *t, Transform *tfm, const float tmax)
{
if(*t != FLT_MAX)
- *t *= length(transform_direction(tfm, 1.0f/(*idir)));
+ *t *= len(transform_direction(tfm, 1.0f/(*idir)));
*P = ray->P;
*idir = bvh_inverse_direction(ray->D);
@@ -489,14 +489,14 @@
t = p_curr.z;
}
else {
- float l = length(p_en - p_st);
+ float l = len(p_en - p_st);
/*minimum width extension*/
float or1 = r1;
float or2 = r2;
if(difl != 0.0f) {
- mw_extension = min(length(p_st - P) * difl, extmax);
+ mw_extension = min(len(p_st - P) * difl, extmax);
or1 = r1 < mw_extension ? mw_extension : r1;
- mw_extension = min(length(p_en - P) * difl, extmax);
+ mw_extension = min(len(p_en - P) * difl, extmax);
or2 = r2 < mw_extension ? mw_extension : r2;
}
/* --- */
@@ -611,9 +611,9 @@
float r1 = or1;
float r2 = or2;
if(difl != 0.0f) {
- float pixelsize = min(length(p1 - P) * difl, extmax);
+ float pixelsize = min(len(p1 - P) * difl, extmax);
r1 = or1 < pixelsize ? pixelsize : or1;
- pixelsize = min(length(p2 - P) * difl, extmax);
+ pixelsize = min(len(p2 - P) * difl, extmax);
r2 = or2 < pixelsize ? pixelsize : or2;
}
/* --- */
@@ -621,14 +621,14 @@
float mr = max(r1,r2);
float3 dif = P - p1;
float3 dir = 1.0f/idir;
- float l = length(p2 - p1);
+ float l = len(p2 - p1);
float sp_r = mr + 0.5f * l;
float3 sphere_dif = P - ((p1 + p2) * 0.5f);
float sphere_b = dot(dir,sphere_dif);
sphere_dif = sphere_dif - sphere_b * dir;
sphere_b = dot(dir,sphere_dif);
- float sdisc = sphere_b * sphere_b - length_squared(sphere_dif) + sp_r * sp_r;
+ float sdisc = sphere_b * sphere_b - len_squared(sphere_dif) + sp_r * sp_r;
if(sdisc < 0.0f)
return;
@@ -652,8 +652,8 @@
/* test minimum separation*/
float3 cprod = cross(tg, dir);
float3 cprod2 = cross(tg, dif);
- float cprodsq = length_squared(cprod);
- float cprod2sq = length_squared(cprod2);
+ float cprodsq = len_squared(cprod);
+ float cprod2sq = len_squared(cprod2);
float distscaled = dot(cprod,dif);
if(cprodsq == 0)
@@ -1010,7 +1010,7 @@
P = transform_point(&tfm, P);
D = transform_direction(&tfm, D*t);
- D = normalize_length(D, &t);
+ D = normalize_len(D, &t);
}
P = P + D*t;
@@ -1080,7 +1080,7 @@
P = transform_point(&tfm, P);
D = transform_direction(&tfm, D*t);
- D = normalize_length(D, &t);
+ D = normalize_len(D, &t);
}
int prim = kernel_tex_fetch(__prim_index, isect->prim);
@@ -1092,7 +1092,7 @@
float4 P1 = kernel_tex_fetch(__curve_keys, k0);
float4 P2 = kernel_tex_fetch(__curve_keys, k1);
float l = 1.0f;
- float3 tg = normalize_length(float4_to_float3(P2 - P1),&l);
+ float3 tg = normalize_len(float4_to_float3(P2 - P1),&l);
float r1 = P1.w;
float r2 = P2.w;
float gd = ((r2 - r1)/l);
Modified: branches/multiview/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/multiview/intern/cycles/kernel/kernel_camera.h 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/kernel/kernel_camera.h 2013-06-04 18:04:34 UTC (rev 57237)
@@ -255,7 +255,7 @@
return fabsf(dot((P - camP), camD));
}
else
- return length(P - camP);
+ return len(P - camP);
}
CCL_NAMESPACE_END
Modified: branches/multiview/intern/cycles/kernel/kernel_curve.h
===================================================================
--- branches/multiview/intern/cycles/kernel/kernel_curve.h 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/kernel/kernel_curve.h 2013-06-04 18:04:34 UTC (rev 57237)
@@ -122,7 +122,7 @@
if(sd->segment != ~0) {
float normalmix = kernel_data.curve_kernel_data.normalmix;
- tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / length_squared(sd->dPdu)));
+ tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / len_squared(sd->dPdu)));
tgN = normalize(tgN);
/* need to find suitable scaled gd for corrected normal */
Modified: branches/multiview/intern/cycles/kernel/kernel_emission.h
===================================================================
--- branches/multiview/intern/cycles/kernel/kernel_emission.h 2013-06-04 17:46:19 UTC (rev 57236)
+++ branches/multiview/intern/cycles/kernel/kernel_emission.h 2013-06-04 18:04:34 UTC (rev 57237)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list