Revision: 37024
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37024
Author: psy-fi
Date: 2011-05-30 14:19:32 +0000 (Mon, 30 May 2011)
Log Message:
-----------
merge with trunk r37023
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37023
Modified Paths:
--------------
branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-onion/source/creator/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/trunk/blender:36833-37000
+ /branches/soc-2010-jwilkins:28499-37009
/trunk/blender:36833-37023
Modified:
branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
2011-05-30 12:19:30 UTC (rev 37023)
+++ branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
2011-05-30 14:19:32 UTC (rev 37024)
@@ -59,6 +59,7 @@
:rtype: :class:`Image`
"""
import os
+ import bpy
# TODO: recursive
Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
2011-05-30 12:19:30 UTC (rev 37023)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
2011-05-30 14:19:32 UTC (rev 37024)
@@ -2333,9 +2333,10 @@
col.prop(toolsettings, "use_etch_autoname")
col.prop(toolsettings, "etch_number")
col.prop(toolsettings, "etch_side")
- col.operator("sketch.convert", text="Convert")
+ col.operator("sketch.convert", text="Convert")
+
class VIEW3D_PT_context_properties(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
Modified: branches/soc-2011-onion/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- branches/soc-2011-onion/source/blender/modifiers/intern/MOD_boolean.c
2011-05-30 12:19:30 UTC (rev 37023)
+++ branches/soc-2011-onion/source/blender/modifiers/intern/MOD_boolean.c
2011-05-30 14:19:32 UTC (rev 37024)
@@ -92,20 +92,57 @@
}
#ifdef WITH_MOD_BOOLEAN
+static DerivedMesh *get_quick_derivedMesh(DerivedMesh *derivedData,
DerivedMesh *dm, int operation)
+{
+ DerivedMesh *result = NULL;
+
+ if(derivedData->getNumFaces(derivedData) == 0 || dm->getNumFaces(dm) ==
0) {
+ switch(operation) {
+ case eBooleanModifierOp_Intersect:
+ result = CDDM_new(0, 0, 0);
+ break;
+
+ case eBooleanModifierOp_Union:
+ if(derivedData->getNumFaces(derivedData))
result = derivedData;
+ else result = CDDM_copy(dm);
+
+ break;
+
+ case eBooleanModifierOp_Difference:
+ result = derivedData;
+ break;
+ }
+ }
+
+ return result;
+}
+
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *derivedData,
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
BooleanModifierData *bmd = (BooleanModifierData*) md;
- DerivedMesh *dm = bmd->object->derivedFinal;
+ DerivedMesh *dm;
- /* we do a quick sanity check */
- if(dm && (derivedData->getNumFaces(derivedData) > 3)
- && bmd->object && dm->getNumFaces(dm) > 3) {
- DerivedMesh *result = NewBooleanDerivedMesh(dm, bmd->object,
derivedData, ob,
- 1 + bmd->operation);
+ if(!bmd->object)
+ return derivedData;
+ dm = bmd->object->derivedFinal;
+
+ if(dm) {
+ DerivedMesh *result;
+
+ /* when one of objects is empty (has got no faces) we could
speed up
+ calculation a bit returning one of objects' derived meshes
(or empty one)
+ Returning mesh is depended on modifieier's operation
(sergey) */
+ result = get_quick_derivedMesh(derivedData, dm, bmd->operation);
+
+ if(result == NULL) {
+ result = NewBooleanDerivedMesh(dm, bmd->object,
derivedData, ob,
+ 1 + bmd->operation);
+ }
+
/* if new mesh returned, return it; otherwise there was
* an error, so delete the modifier object */
if(result)
Modified:
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
2011-05-30 12:19:30 UTC (rev 37023)
+++ branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
2011-05-30 14:19:32 UTC (rev 37024)
@@ -1009,6 +1009,8 @@
if(wt==timer)
break;
if(wt) {
+ if(wm->reports.reporttimer == wt)
+ wm->reports.reporttimer= NULL;
BLI_remlink(&wm->timers, wt);
if(wt->customdata)
Modified: branches/soc-2011-onion/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/source/creator/CMakeLists.txt 2011-05-30
12:19:30 UTC (rev 37023)
+++ branches/soc-2011-onion/source/creator/CMakeLists.txt 2011-05-30
14:19:32 UTC (rev 37024)
@@ -191,10 +191,10 @@
set_target_properties(
blender
PROPERTIES
- PREFIX ""
- OUTPUT_NAME bpy
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
- RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/bin # only needed on windows
+ PREFIX ""
+ OUTPUT_NAME bpy
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin #
only needed on windows
)
if(WIN32)
@@ -257,9 +257,9 @@
if(WITH_INSTALL_PORTABLE)
install(
FILES
- ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
- ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
+ ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
DESTINATION ${TARGETDIR}
)
@@ -305,12 +305,12 @@
)
install(
DIRECTORY
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
+
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
PATTERN ".svn" EXCLUDE
PATTERN "*.svg" EXCLUDE
@@ -462,10 +462,11 @@
PATTERN "__pycache__" EXCLUDE
)
- # TODO, multiple targets?
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION
${TARGETDIR} CONFIGURATIONS Release)
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION
${TARGETDIR} CONFIGURATIONS RelWithDebInfo)
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION
${TARGETDIR} CONFIGURATIONS MinSizeRel)
+ install(
+ FILES ${LIBDIR}/python/lib/python32.dll
+ DESTINATION ${TARGETDIR}
+ CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+ )
install(
FILES ${LIBDIR}/python/lib/python32_d.dll
@@ -490,35 +491,15 @@
install(
CODE
"
- execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
chdir \"${TARGETDIR_VER}/python/lib\"
- \"${CMAKE_COMMAND}\" -E tar xzfv
\"${LIBDIR}/release/python32.tar.gz\")
+ if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL
\"Debug\")
+ execute_process(COMMAND
\"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
+ \"${CMAKE_COMMAND}\" -E tar
xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
+ else()
+ execute_process(COMMAND
\"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
+ \"${CMAKE_COMMAND}\" -E tar
xzfv \"${LIBDIR}/release/python32.tar.gz\")
+ endif()
"
- CONFIGURATIONS Release
)
- install(
- CODE
- "
- execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
chdir \"${TARGETDIR_VER}/python/lib\"
- \"${CMAKE_COMMAND}\" -E tar xzfv
\"${LIBDIR}/release/python32.tar.gz\")
- "
- CONFIGURATIONS RelWithDebInfo
- )
- install(
- CODE
- "
- execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
chdir \"${TARGETDIR_VER}/python/lib\"
- \"${CMAKE_COMMAND}\" -E tar xzfv
\"${LIBDIR}/release/python32.tar.gz\")
- "
- CONFIGURATIONS MinSizeRel
- )
- install(
- CODE
- "
- execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
chdir \"${TARGETDIR_VER}/python/lib\"
- \"${CMAKE_COMMAND}\" -E tar xzfv
\"${LIBDIR}/release/python32_d.tar.gz\")
- "
- CONFIGURATIONS Debug
- )
# doesnt work, todo
# install(CODE "execute_process(COMMAND find
${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {}
'\;')")
@@ -534,8 +515,8 @@
else()
install(
FILES
- ${LIBDIR}/png/lib/libpng.dll
- ${LIBDIR}/zlib/lib/zlib.dll
+ ${LIBDIR}/png/lib/libpng.dll
+ ${LIBDIR}/zlib/lib/zlib.dll
DESTINATION ${TARGETDIR}
)
endif()
@@ -555,11 +536,11 @@
if(WITH_CODEC_FFMPEG)
install(
FILES
- ${LIBDIR}/ffmpeg/lib/avcodec-52.dll
- ${LIBDIR}/ffmpeg/lib/avformat-52.dll
- ${LIBDIR}/ffmpeg/lib/avdevice-52.dll
- ${LIBDIR}/ffmpeg/lib/avutil-50.dll
- ${LIBDIR}/ffmpeg/lib/swscale-0.dll
+ ${LIBDIR}/ffmpeg/lib/avcodec-52.dll
+ ${LIBDIR}/ffmpeg/lib/avformat-52.dll
+ ${LIBDIR}/ffmpeg/lib/avdevice-52.dll
+ ${LIBDIR}/ffmpeg/lib/avutil-50.dll
+ ${LIBDIR}/ffmpeg/lib/swscale-0.dll
DESTINATION ${TARGETDIR}
)
@@ -567,8 +548,7 @@
if(WITH_CODEC_SNDFILE)
install(
- FILES
- ${LIBDIR}/sndfile/lib/libsndfile-1.dll
+ FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
DESTINATION ${TARGETDIR}
)
endif()
@@ -576,8 +556,8 @@
if(WITH_OPENAL)
install(
FILES
- ${LIBDIR}/openal/lib/OpenAL32.dll
- ${LIBDIR}/openal/lib/wrap_oal.dll
+ ${LIBDIR}/openal/lib/OpenAL32.dll
+ ${LIBDIR}/openal/lib/wrap_oal.dll
DESTINATION ${TARGETDIR}
)
endif()
@@ -585,8 +565,7 @@
if(WITH_SDL)
if(NOT CMAKE_CL_64)
install(
- FILES
- ${LIBDIR}/sdl/lib/SDL.dll
+ FILES ${LIBDIR}/sdl/lib/SDL.dll
DESTINATION ${TARGETDIR}
)
endif()
@@ -594,14 +573,12 @@
if(NOT CMAKE_CL_64)
install(
- FILES
- ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
+ FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
DESTINATION ${TARGETDIR}
)
else()
install(
- FILES
- ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+ FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
DESTINATION ${TARGETDIR}
)
endif()
Modified:
branches/soc-2011-onion/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
