[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31881] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 31880.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Sep 11 13:16:56 CEST 2010
Revision: 31881
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31881
Author: kjym3
Date: 2010-09-11 13:16:55 +0200 (Sat, 11 Sep 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 31880.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31880
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/blender.1.py
branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/tools/pydna.py
branches/soc-2008-mxcurioni/release/VERSION
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/blend_render_info.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpyml.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpyml_ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/graphviz_export.py
branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/nla.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/test/rna_info_dump.py
branches/soc-2008-mxcurioni/release/windows/extra/Help.url
branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/object/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/quicktime/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-09-11 11:16:55 UTC (rev 31881)
@@ -309,8 +309,8 @@
IF(WITH_OPENMP)
LIST(APPEND LLIBS -lgomp)
- LIST(APPEND CMAKE_C_FLAGS -fopenmp)
- LIST(APPEND CMAKE_CXX_FLAGS -fopenmp)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
@@ -401,8 +401,7 @@
ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC)
@@ -865,8 +864,7 @@
IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
Modified: branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py 2010-09-11 11:16:55 UTC (rev 31881)
@@ -20,6 +20,7 @@
# <pep8 compliant>
+
def print_help(targets):
print("CMake quicky wrapper, no valid targets given.")
print(" * targets can contain a subset of the full target name.")
@@ -36,11 +37,11 @@
for t in targets:
print(" %s" % t)
print("...exiting")
-
+
def main():
targets = set()
-
+
# collect targets
file = open("Makefile", "r")
for line in file:
@@ -54,13 +55,12 @@
line = line.split(":", 1)[0]
- if "/" in line: # cmake terget options, dont need these
+ if "/" in line: # cmake terget options, dont need these
continue
targets.add(line)
file.close()
-
# remove cmake targets
bad = set([
"help",
@@ -75,10 +75,9 @@
"depend",
"cmake_check_build_system",
])
-
+
targets -= set(bad)
-
# parse args
targets = list(targets)
targets.sort()
@@ -106,7 +105,7 @@
print(" %s" % t)
print("...aborting.")
return
-
+
# execute
cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
print("cmake building with targets: %s" % " ".join(targets_new))
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2010-09-11 11:16:55 UTC (rev 31881)
@@ -15,7 +15,7 @@
Variables = SCons.Variables
BoolVariable = SCons.Variables.BoolVariable
-VERSION = '2.53' # This is used in creating the local config directories
+VERSION = '2.54' # This is used in creating the local config directories
def print_arguments(args, bc):
if len(args):
Modified: branches/soc-2008-mxcurioni/doc/blender.1.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/blender.1.py 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/doc/blender.1.py 2010-09-11 11:16:55 UTC (rev 31881)
@@ -91,25 +91,25 @@
l = lines.pop(0)
if l.startswith("Environment Variables:"):
fw('.SH "ENVIRONMENT VARIABLES"\n')
- elif l.endswith(":"): # one line
+ elif l.endswith(":"): # one line
fw('.SS "%s"\n\n' % l)
- elif l.startswith("-") or l.startswith("/"): # can be multi line
+ elif l.startswith("-") or l.startswith("/"): # can be multi line
fw('.TP\n')
fw('.B %s\n' % man_format(l))
while lines:
# line with no
- if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): # no white space
+ if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): # no white space
break
- if not l: # second blank line
+ if not l: # second blank line
fw('.IP\n')
else:
fw('.br\n')
l = lines.pop(0)
- l = l[1:] # remove first whitespace (tab)
+ l = l[1:] # remove first whitespace (tab)
fw('%s\n' % man_format(l))
Modified: branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt 2010-09-11 11:16:55 UTC (rev 31881)
@@ -27,7 +27,7 @@
SET(INC include src)
IF(UNIX)
- SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
ENDIF(UNIX)
SET(SRC
@@ -37,4 +37,3 @@
ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
Modified: branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2010-09-11 11:16:55 UTC (rev 31881)
@@ -36,49 +36,43 @@
)
IF(WITH_FFMPEG)
- LIST(APPEND INC ffmpeg)
- LIST(APPEND INC ${FFMPEG_INC})
+ LIST(APPEND INC ffmpeg ${FFMPEG_INC})
FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
IF(WITH_SDL)
- LIST(APPEND INC SDL)
- LIST(APPEND INC ${SDL_INCLUDE_DIR})
+ LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
FILE(GLOB SDLSRC SDL/*.cpp)
ADD_DEFINITIONS(-DWITH_SDL)
ENDIF(WITH_SDL)
IF(WITH_OPENAL)
- LIST(APPEND INC OpenAL)
- LIST(APPEND INC ${OPENAL_INCLUDE_DIR})
+ LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
FILE(GLOB OPENALSRC OpenAL/*.cpp)
ADD_DEFINITIONS(-DWITH_OPENAL)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
- LIST(APPEND INC jack)
- LIST(APPEND INC ${JACK_INC})
+ LIST(APPEND INC jack ${JACK_INC})
FILE(GLOB JACKSRC jack/*.cpp)
ADD_DEFINITIONS(-DWITH_JACK)
ENDIF(WITH_JACK)
IF(WITH_SNDFILE)
- LIST(APPEND INC sndfile)
- LIST(APPEND INC ${SNDFILE_INC})
+ LIST(APPEND INC sndfile ${SNDFILE_INC})
FILE(GLOB SNDFILESRC sndfile/*.cpp)
ADD_DEFINITIONS(-DWITH_SNDFILE)
ENDIF(WITH_SNDFILE)
#IF(WITH_FFTW3)
-# SET(INC ${INC} fftw ${FFTW3_INC})
+# LIST(APPEND INC fftw ${FFTW3_INC})
# FILE(GLOB FFTW3SRC fftw/*.cpp)
# ADD_DEFINITIONS(-DWITH_FFTW3)
#ENDIF(WITH_FFTW3)
IF(WITH_PYTHON)
- LIST(APPEND INC Python)
- LIST(APPEND INC ${PYTHON_INC})
+ LIST(APPEND INC Python ${PYTHON_INC})
FILE(GLOB PYTHONSRC Python/*.cpp)
ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
Modified: branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-09-11 11:16:55 UTC (rev 31881)
@@ -52,13 +52,13 @@
IF(APPLE)
IF(WITH_COCOA)
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
)
ELSE(WITH_COCOA)
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
@@ -69,18 +69,18 @@
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
ELSEIF(WIN32)
- SET(INC ${INC} ${WINTAB_INC})
+ LIST(APPEND INC ${WINTAB_INC})
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
)
ELSEIF(UNIX)
- SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
- SET(SRC ${SRC}
+ LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-09-11 11:16:55 UTC (rev 31881)
@@ -207,17 +207,17 @@
}
else {
// An invalid window could be one that was used to test for AA
- GHOST_Window *other_window = ((GHOST_WindowWin32*)window)->getNextWindow();
-
- delete window;
- window = 0;
+ window = ((GHOST_WindowWin32*)window)->getNextWindow();
// If another window is found, let the wm know about that one, but not the old one
- if (other_window)
- {
- m_windowManager->addWindow(other_window);
- window = other_window;
+ if (window->getValid()) {
+ m_windowManager->addWindow(window);
}
+ else {
+ delete window;
+ window = 0;
+ }
+
}
}
return window;
Modified: branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt 2010-09-11 10:34:38 UTC (rev 31880)
+++ branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt 2010-09-11 11:16:55 UTC (rev 31881)
@@ -24,7 +24,14 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC
+ intern
+ ../memutil
+ ../guardealloc
+ ../../extern/bullet2/src
+ ${PNG_INC}
+ ${ZLIB_INC}
+)
FILE(GLOB SRC intern/*.cpp)
@@ -34,9 +41,8 @@
IF(WITH_FFTW3)
ADD_DEFINITIONS(-DFFTW3=1)
- SET(INC ${INC} ${FFTW3_INC})
+ LIST(APPEND INC ${FFTW3_INC})
ENDIF(WITH_FFTW3)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list