[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57212] branches/multiview: multiview : merging from github branch
Dalai Felinto
dfelinto at gmail.com
Mon Jun 3 03:29:01 CEST 2013
Revision: 57212
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57212
Author: dfelinto
Date: 2013-06-03 01:28:59 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
multiview : merging from github branch
github: ff87db5df53ac449a405dc9cef51baf408229555
note: this is trunk/svn revision: 57211
Modified Paths:
--------------
branches/multiview/CMakeLists.txt
branches/multiview/SConstruct
branches/multiview/build_files/scons/config/linuxcross-config.py
branches/multiview/build_files/scons/config/win32-mingw-config.py
branches/multiview/build_files/scons/config/win32-vc-config.py
branches/multiview/build_files/scons/config/win64-vc-config.py
branches/multiview/build_files/scons/tools/Blender.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/kernel_types.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_transform.h
branches/multiview/intern/guardedalloc/intern/mallocn.c
branches/multiview/release/scripts/freestyle/style_modules/parameter_editor.py
branches/multiview/release/scripts/startup/bl_operators/freestyle.py
branches/multiview/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/multiview/source/blender/blenkernel/BKE_DerivedMesh.h
branches/multiview/source/blender/blenkernel/BKE_modifier.h
branches/multiview/source/blender/blenkernel/BKE_text.h
branches/multiview/source/blender/blenkernel/BKE_texture.h
branches/multiview/source/blender/blenkernel/intern/image.c
branches/multiview/source/blender/blenkernel/intern/mesh.c
branches/multiview/source/blender/blenkernel/intern/modifier.c
branches/multiview/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/multiview/source/blender/blenkernel/intern/text.c
branches/multiview/source/blender/blenkernel/intern/texture.c
branches/multiview/source/blender/blenlib/intern/path_util.c
branches/multiview/source/blender/blenlib/intern/scanfill.c
branches/multiview/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/multiview/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/multiview/source/blender/bmesh/intern/bmesh_polygon.c
branches/multiview/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/multiview/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/multiview/source/blender/collada/GeometryExporter.cpp
branches/multiview/source/blender/collada/collada_utils.cpp
branches/multiview/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/multiview/source/blender/editors/include/UI_interface.h
branches/multiview/source/blender/editors/interface/interface.c
branches/multiview/source/blender/editors/interface/interface_handlers.c
branches/multiview/source/blender/editors/mesh/editmesh_select.c
branches/multiview/source/blender/editors/mesh/editmesh_tools.c
branches/multiview/source/blender/editors/mesh/editmesh_utils.c
branches/multiview/source/blender/editors/object/object_edit.c
branches/multiview/source/blender/editors/sculpt_paint/paint_cursor.c
branches/multiview/source/blender/editors/sculpt_paint/sculpt.c
branches/multiview/source/blender/editors/space_image/image_ops.c
branches/multiview/source/blender/editors/space_sequencer/sequencer_draw.c
branches/multiview/source/blender/editors/space_text/text_ops.c
branches/multiview/source/blender/makesdna/DNA_userdef_types.h
branches/multiview/source/blender/makesrna/intern/rna_access.c
branches/multiview/source/blender/makesrna/intern/rna_main_api.c
branches/multiview/source/blender/makesrna/intern/rna_text.c
branches/multiview/source/blender/modifiers/intern/MOD_armature.c
branches/multiview/source/blender/modifiers/intern/MOD_array.c
branches/multiview/source/blender/modifiers/intern/MOD_bevel.c
branches/multiview/source/blender/modifiers/intern/MOD_boolean.c
branches/multiview/source/blender/modifiers/intern/MOD_build.c
branches/multiview/source/blender/modifiers/intern/MOD_cast.c
branches/multiview/source/blender/modifiers/intern/MOD_cloth.c
branches/multiview/source/blender/modifiers/intern/MOD_collision.c
branches/multiview/source/blender/modifiers/intern/MOD_curve.c
branches/multiview/source/blender/modifiers/intern/MOD_decimate.c
branches/multiview/source/blender/modifiers/intern/MOD_displace.c
branches/multiview/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/multiview/source/blender/modifiers/intern/MOD_edgesplit.c
branches/multiview/source/blender/modifiers/intern/MOD_explode.c
branches/multiview/source/blender/modifiers/intern/MOD_fluidsim.c
branches/multiview/source/blender/modifiers/intern/MOD_hook.c
branches/multiview/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/multiview/source/blender/modifiers/intern/MOD_lattice.c
branches/multiview/source/blender/modifiers/intern/MOD_meshcache.c
branches/multiview/source/blender/modifiers/intern/MOD_meshdeform.c
branches/multiview/source/blender/modifiers/intern/MOD_mirror.c
branches/multiview/source/blender/modifiers/intern/MOD_none.c
branches/multiview/source/blender/modifiers/intern/MOD_particleinstance.c
branches/multiview/source/blender/modifiers/intern/MOD_screw.c
branches/multiview/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/multiview/source/blender/modifiers/intern/MOD_smoke.c
branches/multiview/source/blender/modifiers/intern/MOD_smooth.c
branches/multiview/source/blender/modifiers/intern/MOD_softbody.c
branches/multiview/source/blender/modifiers/intern/MOD_solidify.c
branches/multiview/source/blender/modifiers/intern/MOD_subsurf.c
branches/multiview/source/blender/modifiers/intern/MOD_surface.c
branches/multiview/source/blender/modifiers/intern/MOD_triangulate.c
branches/multiview/source/blender/modifiers/intern/MOD_warp.c
branches/multiview/source/blender/modifiers/intern/MOD_wave.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/multiview/source/blender/python/bmesh/bmesh_py_types.c
branches/multiview/source/blender/windowmanager/intern/wm_event_system.c
branches/multiview/source/blender/windowmanager/intern/wm_operators.c
branches/multiview/source/creator/CMakeLists.txt
Modified: branches/multiview/CMakeLists.txt
===================================================================
--- branches/multiview/CMakeLists.txt 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/CMakeLists.txt 2013-06-03 01:28:59 UTC (rev 57212)
@@ -1088,11 +1088,7 @@
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
- if(CMAKE_CL_64)
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
- else()
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
- endif()
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
Modified: branches/multiview/SConstruct
===================================================================
--- branches/multiview/SConstruct 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/SConstruct 2013-06-03 01:28:59 UTC (rev 57212)
@@ -910,7 +910,6 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
Modified: branches/multiview/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/multiview/build_files/scons/config/linuxcross-config.py 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/build_files/scons/config/linuxcross-config.py 2013-06-03 01:28:59 UTC (rev 57212)
@@ -78,7 +78,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIB = 'libz_st'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/multiview/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/multiview/build_files/scons/config/win32-mingw-config.py 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/build_files/scons/config/win32-mingw-config.py 2013-06-03 01:28:59 UTC (rev 57212)
@@ -78,7 +78,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIB = 'libz_st'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/multiview/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/multiview/build_files/scons/config/win32-vc-config.py 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/build_files/scons/config/win32-vc-config.py 2013-06-03 01:28:59 UTC (rev 57212)
@@ -82,7 +82,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIB = 'libz_st'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/multiview/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/multiview/build_files/scons/config/win64-vc-config.py 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/build_files/scons/config/win64-vc-config.py 2013-06-03 01:28:59 UTC (rev 57212)
@@ -78,7 +78,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIB = 'libz_st'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/multiview/build_files/scons/tools/Blender.py
===================================================================
--- branches/multiview/build_files/scons/tools/Blender.py 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/build_files/scons/tools/Blender.py 2013-06-03 01:28:59 UTC (rev 57212)
@@ -155,12 +155,12 @@
libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
if lenv['WITH_BF_STATICOPENEXR']:
statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
+ if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+ statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_TIFF']:
libincs += Split(lenv['BF_TIFF_LIBPATH'])
if lenv['WITH_BF_STATICTIFF']:
statlibs += Split(lenv['BF_TIFF_LIB_STATIC'])
- if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
- statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_FFTW3']:
libincs += Split(lenv['BF_FFTW3_LIBPATH'])
if lenv['WITH_BF_STATICFFTW3']:
@@ -282,10 +282,10 @@
if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
syslibs += Split(lenv['BF_OPENEXR_LIB'])
+ if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
+ syslibs += Split(lenv['BF_ZLIB_LIB'])
if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']:
syslibs += Split(lenv['BF_TIFF_LIB'])
- if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
- syslibs += Split(lenv['BF_ZLIB_LIB'])
if lenv['WITH_BF_FFMPEG'] and not lenv['WITH_BF_STATICFFMPEG']:
syslibs += Split(lenv['BF_FFMPEG_LIB'])
if lenv['WITH_BF_OGG']:
Modified: branches/multiview/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/multiview/intern/cycles/blender/blender_curves.cpp 2013-06-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/intern/cycles/blender/blender_curves.cpp 2013-06-03 01:28:59 UTC (rev 57212)
@@ -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 += len(cKey - pcKey);
+ curve_length += length(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(len_squared(firstxbasis)!= 0.0f)
+ if(length_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(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -528,7 +528,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_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(len_squared(firstxbasis)!= 0.0f)
+ if(length_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(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -643,7 +643,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_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-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/intern/cycles/blender/blender_mesh.cpp 2013-06-03 01:28:59 UTC (rev 57212)
@@ -237,8 +237,8 @@
bool smooth = f->use_smooth();
if(n == 4) {
- 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) {
+ 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) {
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-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/intern/cycles/bvh/bvh.cpp 2013-06-03 01:28:59 UTC (rev 57212)
@@ -287,7 +287,7 @@
float3 v1 = mesh->curve_keys[k1].co;
float3 d0 = v1 - v0;
- float l = len(d0);
+ float l = length(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-03 00:46:20 UTC (rev 57211)
+++ branches/multiview/intern/cycles/kernel/kernel_bvh.h 2013-06-03 01:28:59 UTC (rev 57212)
@@ -64,7 +64,7 @@
float3 dir = transform_direction(&tfm, ray->D);
float len;
- dir = normalize_len(dir, &len);
+ dir = normalize_length(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 *= len(transform_direction(&tfm, 1.0f/(*idir)));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list