[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43035] branches/bmesh/blender: svn merge ^/trunk/blender -r43009:43033
Campbell Barton
ideasman42 at gmail.com
Sat Dec 31 13:03:46 CET 2011
Revision: 43035
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43035
Author: campbellbarton
Date: 2011-12-31 12:03:36 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r43009:43033
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43009
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/cmake/macros.cmake
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/intern/CMakeLists.txt
branches/bmesh/blender/intern/SConscript
branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
branches/bmesh/blender/release/datafiles/blender_icons.png
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenloader/BLO_sys_types.h
branches/bmesh/blender/source/blender/editors/datafiles/blender_icons.png.c
branches/bmesh/blender/source/blender/editors/include/UI_icons.h
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Ketsji/KX_FontObject.cpp
Added Paths:
-----------
branches/bmesh/blender/intern/dualcon/
branches/bmesh/blender/source/blender/modifiers/intern/MOD_remesh.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:39992-43009
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:39992-43033
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/CMakeLists.txt 2011-12-31 12:03:36 UTC (rev 43035)
@@ -169,6 +169,7 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -765,22 +766,27 @@
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
+
+ set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
set(OPENCOLLADA_LIBRARIES
- ${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
- ${LIBDIR}/opencollada/lib/MathMLSolver.lib
- ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
- ${LIBDIR}/opencollada/lib/xml2.lib
- ${LIBDIR}/opencollada/lib/buffer.lib
- ${LIBDIR}/opencollada/lib/ftoa.lib
- ${LIBDIR}/opencollada/lib/UTF.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
+ ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
+ ${OPENCOLLADA_LIBPATH}/xml2.lib
+ ${OPENCOLLADA_LIBPATH}/buffer.lib
+ ${OPENCOLLADA_LIBPATH}/ftoa.lib
+ ${OPENCOLLADA_LIBPATH}/UTF.lib
)
set(PCRE_LIBRARIES
- ${LIBDIR}/opencollada/lib/pcre.lib
+ ${OPENCOLLADA_LIBPATH}/pcre.lib
)
+
+ unset(OPENCOLLADA_LIBPATH)
+
endif()
if(WITH_CODEC_FFMPEG)
@@ -798,18 +804,8 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC90)
- set(MSVC_LIB _vs2008)
- set(MSVC_INC)
- elseif(MSVC10)
- set(MSVC_LIB _vs2010)
- set(MSVC_INC _vs2010)
- else()
- set(MSVC_LIB msvc)
- set(MSVC_INC)
- endif()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set_lib_path(OPENEXR "openexr")
+ set_lib_path(OPENEXR_LIBPATH "openexr/lib")
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib
@@ -817,7 +813,7 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+ set_lib_path(OPENEXR_INCUDE "openexr/include")
set(OPENEXR_INCLUDE_DIRS
${OPENEXR_INCUDE}
${OPENEXR_INCUDE}/IlmImf
@@ -844,9 +840,9 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
- set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
- set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
-
+ set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
+ set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -879,7 +875,7 @@
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
- set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
set(OPENIMAGEIO_DEFINITIONS)
endif()
@@ -1431,11 +1427,9 @@
if(MSVC10)
if(WITH_IMAGE_OPENEXR)
message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
- set(WITH_IMAGE_OPENEXR OFF)
endif()
if(WITH_OPENCOLLADA)
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
- set(WITH_OPENCOLLADA OFF)
endif()
endif()
@@ -1577,6 +1571,7 @@
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
+ info_cfg_option(WITH_MOD_REMESH)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/SConstruct 2011-12-31 12:03:36 UTC (rev 43035)
@@ -264,6 +264,7 @@
target_env_defs['WITH_BF_OCEANSIM'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
+ target_env_defs['WITH_BF_REMESH'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
Modified: branches/bmesh/blender/build_files/cmake/macros.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/macros.cmake 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/build_files/cmake/macros.cmake 2011-12-31 12:03:36 UTC (rev 43035)
@@ -665,3 +665,16 @@
endif()
endfunction()
+macro(set_lib_path
+ lvar
+ lproj)
+
+
+ if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj})
+ set(${lvar} ${LIBDIR}/vc2010/${lproj})
+ else()
+ set(${lvar} ${LIBDIR}/${lproj})
+ endif()
+
+
+endmacro()
\ No newline at end of file
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-31 12:03:36 UTC (rev 43035)
@@ -152,6 +152,7 @@
'WITH_BF_FLUID',
'WITH_BF_DECIMATE',
'WITH_BF_BOOLEAN',
+ 'WITH_BF_REMESH',
'WITH_BF_OCEANSIM',
'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',
@@ -261,6 +262,7 @@
(BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
(BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
(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)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
Modified: branches/bmesh/blender/intern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/CMakeLists.txt 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/intern/CMakeLists.txt 2011-12-31 12:03:36 UTC (rev 43035)
@@ -36,6 +36,10 @@
add_subdirectory(audaspace)
endif()
+if(WITH_MOD_REMESH)
+ add_subdirectory(dualcon)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
Modified: branches/bmesh/blender/intern/SConscript
===================================================================
--- branches/bmesh/blender/intern/SConscript 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/intern/SConscript 2011-12-31 12:03:36 UTC (rev 43035)
@@ -22,6 +22,9 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
+if env ['WITH_BF_REMESH']:
+ SConscript(['dualcon/SConscript'])
+
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
Modified: branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h 2011-12-31 12:03:36 UTC (rev 43035)
@@ -94,7 +94,9 @@
#include <stdint.h>
/* XXX */
-#ifndef uint64_t
+
+#ifndef UINT64_MAX
+# define UINT64_MAX 18446744073709551615
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43009
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43033
Modified: branches/bmesh/blender/release/datafiles/blender_icons.png
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-12-31 11:37:54 UTC (rev 43034)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-12-31 12:03:36 UTC (rev 43035)
@@ -823,6 +823,20 @@
col.prop(md, "width", slider=True)
col.prop(md, "narrowness", slider=True)
+ def REMESH(self, layout, ob, md):
+ layout.prop(md, "mode")
+
+ layout.prop(md, "octree_depth")
+ layout.prop(md, "scale")
+ row = layout.row()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list