[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24228] branches/bmesh/blender: shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly.
Joseph Eagar
joeedh at gmail.com
Mon Nov 2 07:33:16 CET 2009
Revision: 24228
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24228
Author: joeedh
Date: 2009-11-02 07:33:16 +0100 (Mon, 02 Nov 2009)
Log Message:
-----------
shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/Functors.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/PartialRedux.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Cwise.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Flagged.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Functors.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Matrix.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/NestByValue.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Part.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Swap.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/util/Memory.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/SVD/SVD.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
branches/bmesh/blender/extern/Eigen2/Eigen/src/Sparse/SparseVector.h
branches/bmesh/blender/extern/Eigen2/eigen-update.sh
branches/bmesh/blender/intern/ghost/GHOST_C-api.h
branches/bmesh/blender/intern/ghost/GHOST_IWindow.h
branches/bmesh/blender/intern/ghost/GHOST_Rect.h
branches/bmesh/blender/intern/ghost/GHOST_Types.h
branches/bmesh/blender/intern/ghost/intern/GHOST_C-api.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_Window.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_Window.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.h
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/bmesh/blender/release/scripts/io/engine_render_pov.py
branches/bmesh/blender/release/scripts/io/export_3ds.py
branches/bmesh/blender/release/scripts/io/export_fbx.py
branches/bmesh/blender/release/scripts/io/export_obj.py
branches/bmesh/blender/release/scripts/io/export_ply.py
branches/bmesh/blender/release/scripts/io/export_x3d.py
branches/bmesh/blender/release/scripts/io/import_3ds.py
branches/bmesh/blender/release/scripts/io/import_obj.py
branches/bmesh/blender/release/scripts/io/netrender/client.py
branches/bmesh/blender/release/scripts/io/netrender/master.py
branches/bmesh/blender/release/scripts/io/netrender/master_html.py
branches/bmesh/blender/release/scripts/io/netrender/model.py
branches/bmesh/blender/release/scripts/io/netrender/operators.py
branches/bmesh/blender/release/scripts/io/netrender/slave.py
branches/bmesh/blender/release/scripts/io/netrender/ui.py
branches/bmesh/blender/release/scripts/io/netrender/utils.py
branches/bmesh/blender/release/scripts/modules/bpy_ops.py
branches/bmesh/blender/release/scripts/ui/buttons_data_armature.py
branches/bmesh/blender/release/scripts/ui/buttons_data_bone.py
branches/bmesh/blender/release/scripts/ui/buttons_data_empty.py
branches/bmesh/blender/release/scripts/ui/buttons_data_lamp.py
branches/bmesh/blender/release/scripts/ui/buttons_data_mesh.py
branches/bmesh/blender/release/scripts/ui/buttons_game.py
branches/bmesh/blender/release/scripts/ui/buttons_material.py
branches/bmesh/blender/release/scripts/ui/buttons_object.py
branches/bmesh/blender/release/scripts/ui/buttons_object_constraint.py
branches/bmesh/blender/release/scripts/ui/buttons_particle.py
branches/bmesh/blender/release/scripts/ui/buttons_physics_common.py
branches/bmesh/blender/release/scripts/ui/buttons_physics_field.py
branches/bmesh/blender/release/scripts/ui/buttons_physics_smoke.py
branches/bmesh/blender/release/scripts/ui/buttons_scene.py
branches/bmesh/blender/release/scripts/ui/buttons_texture.py
branches/bmesh/blender/release/scripts/ui/buttons_world.py
branches/bmesh/blender/release/scripts/ui/space_buttons.py
branches/bmesh/blender/release/scripts/ui/space_console.py
branches/bmesh/blender/release/scripts/ui/space_filebrowser.py
branches/bmesh/blender/release/scripts/ui/space_image.py
branches/bmesh/blender/release/scripts/ui/space_info.py
branches/bmesh/blender/release/scripts/ui/space_node.py
branches/bmesh/blender/release/scripts/ui/space_outliner.py
branches/bmesh/blender/release/scripts/ui/space_sequencer.py
branches/bmesh/blender/release/scripts/ui/space_text.py
branches/bmesh/blender/release/scripts/ui/space_time.py
branches/bmesh/blender/release/scripts/ui/space_userpref.py
branches/bmesh/blender/release/scripts/ui/space_view3d.py
branches/bmesh/blender/release/scripts/ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/object/object_shapekey.c
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/SConscript
branches/bmesh/blender/source/creator/buildinfo.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.h
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/nan_compile.mk
branches/bmesh/blender/tools/Blender.py
Added Paths:
-----------
branches/bmesh/blender/release/environment-macosx
branches/bmesh/blender/release/environment-mswindows
branches/bmesh/blender/release/environment-unix
branches/bmesh/blender/source/blender/render/intern/include/raycounter.h
branches/bmesh/blender/source/blender/render/intern/include/rayobject.h
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/CMakeLists.txt 2009-11-02 06:33:16 UTC (rev 24228)
@@ -82,7 +82,8 @@
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
IF (APPLE)
-OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" OFF)
+OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
+OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
ENDIF (APPLE)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -396,17 +397,22 @@
ENDIF(WIN32)
IF(APPLE)
- IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
- ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
- ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ IF(WITH_LIBS10.5)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
+ ELSE(WITH_LIBS10.5)
+ IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
+ ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ ENDIF(WITH_LIBS10.5)
+
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
- SET(OPENAL_INCLUDE_DIR "${OPENAL_INCLUDE_DIR};${LIBDIR}/openal/include")
+ SET(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include")
ELSE(OPENAL_FOUND)
SET(WITH_OPENAL OFF)
ENDIF(OPENAL_FOUND)
@@ -432,20 +438,20 @@
# we use precompiled libraries for py 3.1 and up by default
SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
- # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
SET(PYTHON_LIB python${PYTHON_VERSION})
- SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
# SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
ELSE(PYTHON_VERSION MATCHES 3.1)
# otherwise, use custom system framework
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
SET(PYTHON_VERSION 2.5)
- SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
- # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
+ SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
SET(PYTHON_LIB "")
- SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
+ SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
ENDIF(PYTHON_VERSION MATCHES 3.1)
@@ -457,7 +463,7 @@
IF(WITH_FFTW3)
SET(FFTW3 ${LIBDIR}/fftw3)
SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIB fftw3)
SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
@@ -529,15 +535,21 @@
# buildinfo
-IF(UNIX)
- IF(WITH_BUILDINFO)
+IF(WITH_BUILDINFO)
+ # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
+ IF(UNIX)
EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)
EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
- # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
- ENDIF(WITH_BUILDINFO)
-ENDIF(UNIX)
-
+ ENDIF(UNIX)
+
+ IF(WIN32)
+ EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
+ EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+ ENDIF(WIN32)
+ENDIF(WITH_BUILDINFO)
+
#-----------------------------------------------------------------------------
# Common.
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/Functors.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/Functors.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/Functors.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -43,6 +43,8 @@
inline const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_padd(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_add_op& operator=(const ei_scalar_add_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_add_op<Scalar> >
@@ -138,6 +140,8 @@
inline ei_scalar_pow_op(const Scalar& exponent) : m_exponent(exponent) {}
inline Scalar operator() (const Scalar& a) const { return ei_pow(a, m_exponent); }
const Scalar m_exponent;
+private:
+ ei_scalar_pow_op& operator=(const ei_scalar_pow_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_pow_op<Scalar> >
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/PartialRedux.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/PartialRedux.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Array/PartialRedux.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -133,6 +133,8 @@
inline result_type operator()(const MatrixBase<Derived>& mat) const
{ return mat.redux(m_functor); }
const BinaryOp m_functor;
+private:
+ ei_member_redux& operator=(const ei_member_redux&);
};
/** \array_module \ingroup Array
@@ -290,6 +292,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+ private:
+ PartialRedux& operator=(const PartialRedux&);
};
/** \array_module
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/CommaInitializer.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/CommaInitializer.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -116,6 +116,9 @@
int m_row; // current row id
int m_col; // current col id
int m_currentBlockRows; // current block height
+
+private:
+ CommaInitializer& operator=(const CommaInitializer&);
};
/** \anchor MatrixBaseCommaInitRef
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Cwise.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Cwise.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Cwise.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -178,6 +178,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+ private:
+ Cwise& operator=(const Cwise&);
};
/** \returns a Cwise wrapper of *this providing additional coefficient-wise operations
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Flagged.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Flagged.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Flagged.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -109,6 +109,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+private:
+ Flagged& operator=(const Flagged&);
};
/** \returns an expression of *this with added flags
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Functors.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Functors.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Functors.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -279,6 +279,8 @@
EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_pmul(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_multiple_op& operator=(const ei_scalar_multiple_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_multiple_op<Scalar> >
@@ -294,6 +296,8 @@
EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_pmul(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,true> >
@@ -306,6 +310,8 @@
EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const Scalar& other) : m_other(other) {}
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; }
const Scalar m_other;
+private:
+ ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,false> >
@@ -323,6 +329,8 @@
struct ei_scalar_quotient1_op : ei_scalar_quotient1_impl<Scalar, NumTraits<Scalar>::HasFloatingPoint > {
EIGEN_STRONG_INLINE ei_scalar_quotient1_op(const Scalar& other)
: ei_scalar_quotient1_impl<Scalar, NumTraits<Scalar>::HasFloatingPoint >(other) {}
+private:
+ ei_scalar_quotient1_op& operator=(const ei_scalar_quotient1_op&);
};
// nullary functors
@@ -335,6 +343,8 @@
EIGEN_STRONG_INLINE const Scalar operator() (int, int = 0) const { return m_other; }
EIGEN_STRONG_INLINE const PacketScalar packetOp() const { return ei_pset1(m_other); }
const Scalar m_other;
+private:
+ ei_scalar_constant_op& operator=(const ei_scalar_constant_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_constant_op<Scalar> >
Modified: branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Matrix.h
===================================================================
--- branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Matrix.h 2009-11-02 06:31:23 UTC (rev 24227)
+++ branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/Matrix.h 2009-11-02 06:33:16 UTC (rev 24228)
@@ -505,7 +505,9 @@
template<typename OtherDerived>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list