[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19141] branches/bmesh/blender: merge with trunk.
Joseph Eagar
joeedh at gmail.com
Sat Feb 28 13:49:49 CET 2009
Revision: 19141
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19141
Author: joeedh
Date: 2009-02-28 13:49:18 +0100 (Sat, 28 Feb 2009)
Log Message:
-----------
merge with trunk. also tried to fix tesselator code; new code should've worked, but there's still some problems, possibly not in the tesselator code entirely. also still have reverted tools/Blender.py since scons still isn't fixed, heh.
Modified Paths:
--------------
branches/bmesh/blender/SConstruct
branches/bmesh/blender/extern/bullet2/src/SConscript
branches/bmesh/blender/extern/solid/SConscript
branches/bmesh/blender/intern/ghost/GHOST_Types.h
branches/bmesh/blender/intern/ghost/Makefile
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/bmesh/blender/release/datafiles/blenderbuttons
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenfont/SConscript
branches/bmesh/blender/source/blender/blenfont/intern/Makefile
branches/bmesh/blender/source/blender/blenfont/intern/blf.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_glyph.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/BKE_animsys.h
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/font.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenlib/SConscript
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/editors/Makefile
branches/bmesh/blender/source/blender/editors/SConscript
branches/bmesh/blender/source/blender/editors/animation/anim_channels.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/animation/anim_ops.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_draw.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/poselib.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/curve_intern.h
branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/datafiles/blenderbuttons.c
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
branches/bmesh/blender/source/blender/editors/include/ED_curve.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframes_draw.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_sculpt.h
branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/include/UI_resources.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
branches/bmesh/blender/source/blender/editors/interface/text.c
branches/bmesh/blender/source/blender/editors/interface/view2d.c
branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
branches/bmesh/blender/source/blender/editors/mesh/editdeform.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_lib.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_loop.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_intern.h
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/physics/editparticle.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_intern.h
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_action/action_intern.h
branches/bmesh/blender/source/blender/editors/space_action/action_ops.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_intern.h
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/space_file.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_header.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_intern.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
branches/bmesh/blender/source/blender/editors/space_image/image_header.c
branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_image/image_panels.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_info/Makefile
branches/bmesh/blender/source/blender/editors/space_info/SConscript
branches/bmesh/blender/source/blender/editors/space_info/info_header.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_header.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/bmesh/blender/source/blender/editors/space_time/time_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/util/ed_util.c
branches/bmesh/blender/source/blender/editors/util/editmode_undo.c
branches/bmesh/blender/source/blender/editors/util/undo.c
branches/bmesh/blender/source/blender/editors/uvedit/Makefile
branches/bmesh/blender/source/blender/editors/uvedit/SConscript
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_screen_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_brush.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_main.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
branches/bmesh/blender/source/blender/python/BPY_extern.h
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/readblenfile/SConscript
branches/bmesh/blender/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/windowmanager/SConscript
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_jobs.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
branches/bmesh/blender/source/blender/windowmanager/wm_event_system.h
branches/bmesh/blender/source/blender/windowmanager/wm_event_types.h
branches/bmesh/blender/source/blender/windowmanager/wm_window.h
branches/bmesh/blender/source/creator/SConscript
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/bmesh/blender/source/nan_compile.mk
Added Paths:
-----------
branches/bmesh/blender/source/blender/editors/sculpt_paint/
branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/editors/include/ED_editparticle.h
branches/bmesh/blender/source/blender/editors/sculpt/
branches/bmesh/blender/source/blender/editors/space_view3d/vpaint.c
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/SConstruct 2009-02-28 12:49:18 UTC (rev 19141)
@@ -29,6 +29,13 @@
# Set up some custom actions and target/argument handling
# Then read all SConscripts and build
+import platform as pltfrm
+
+if pltfrm.architecture()[0] == '64bit':
+ bitness = 64
+else:
+ bitness = 32
+
import sys
import os
import os.path
@@ -132,14 +139,17 @@
env['CXX'] = cxx
if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
- platform = 'win32-vc'
+ if bitness == 64:
+ platform = 'win64-vc'
+ else:
+ platform = 'win32-vc'
elif env['CC'] in ['gcc'] and sys.platform=='win32':
platform = 'win32-mingw'
env.SConscriptChdir(0)
crossbuild = B.arguments.get('BF_CROSS', None)
-if crossbuild and platform!='win32':
+if crossbuild and platform not in ('win32-vc', 'win64-vc'):
platform = 'linuxcross'
env['OURPLATFORM'] = platform
@@ -183,7 +193,7 @@
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
if env['WITH_BF_OPENMP'] == 1:
- if env['OURPLATFORM']=='win32-vc':
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
@@ -283,7 +293,7 @@
env['BF_NO_ELBEEM'] = True
env['WITH_BF_PYTHON'] = False
-if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming'):
+if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming', 'win64-vc'):
env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup')
env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
@@ -390,6 +400,7 @@
thesyslibs = B.setup_syslibs(env)
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+ #env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
@@ -471,7 +482,6 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- print ">>>", env['BF_INSTALLDIR'], tp, f
iconlist.append(tp+os.sep+f)
icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
@@ -496,7 +506,6 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- print ">>>", env['BF_INSTALLDIR'], tp, f
pluglist.append(tp+os.sep+f)
plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
@@ -540,14 +549,20 @@
else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
- dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
- '${BF_PNG_LIBPATH}/libpng.dll',
- '${BF_ZLIB_LIBPATH}/zlib.dll',
- '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
+ if env['OURPLATFORM'] == 'win64-vc':
+ dllsources = []
+ else:
+ dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
+ '${BF_PNG_LIBPATH}/libpng.dll',
+ '${BF_ZLIB_LIBPATH}/zlib.dll',
+ '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
if env['WITH_BF_SDL']:
- dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
+ if env['OURPLATFORM'] == 'win64-vc':
+ pass # we link statically already to SDL on win64
+ else:
+ dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
if env['WITH_BF_PYTHON']:
dllsources.append('#release/windows/extra/python25.zip')
dllsources.append('#release/windows/extra/zlib.pyd')
@@ -556,7 +571,10 @@
else:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
if env['WITH_BF_ICONV']:
- dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
+ if env['OURPLATFORM'] == 'win64-vc':
+ pass # we link statically to iconv on win64
+ else:
+ dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
if env['WITH_BF_FFMPEG']:
dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
@@ -601,12 +619,6 @@
if not env['WITHOUT_BF_INSTALL']:
Default(installtarget)
-#------------ RELEASE
-# TODO: zipup the installation
-
-#------------ BLENDERPLAYER
-# TODO: build stubs and link into blenderplayer
-
#------------ EPYDOC
if env['WITH_BF_DOCS']:
SConscript('source/blender/python/api2_2x/doc/SConscript')
Modified: branches/bmesh/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/bmesh/blender/extern/bullet2/src/SConscript 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/extern/bullet2/src/SConscript 2009-02-28 12:49:18 UTC (rev 19141)
@@ -7,7 +7,7 @@
defs = 'USE_DOUBLES QHULL _LIB'
cflags = []
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
Modified: branches/bmesh/blender/extern/solid/SConscript
===================================================================
--- branches/bmesh/blender/extern/solid/SConscript 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/extern/solid/SConscript 2009-02-28 12:49:18 UTC (rev 19141)
@@ -6,7 +6,7 @@
defs = 'USE_DOUBLES QHULL _LIB'
cflags = []
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
elif env['OURPLATFORM']=='win32-mingw':
Modified: branches/bmesh/blender/intern/ghost/GHOST_Types.h
===================================================================
--- branches/bmesh/blender/intern/ghost/GHOST_Types.h 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/intern/ghost/GHOST_Types.h 2009-02-28 12:49:18 UTC (rev 19141)
@@ -104,7 +104,9 @@
GHOST_kWindowState8Normal = 8,
GHOST_kWindowState8Maximized,
GHOST_kWindowState8Minimized,
- GHOST_kWindowState8FullScreen
+ GHOST_kWindowState8FullScreen,
+ GHOST_kWindowStateModified,
+ GHOST_kWindowStateUnModified
} GHOST_TWindowState;
Modified: branches/bmesh/blender/intern/ghost/Makefile
===================================================================
--- branches/bmesh/blender/intern/ghost/Makefile 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/intern/ghost/Makefile 2009-02-28 12:49:18 UTC (rev 19141)
@@ -38,7 +38,7 @@
include nan_subdirs.mk
-install: all debug
+install: all
@[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST)
@[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include
@[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib
Modified: branches/bmesh/blender/intern/ghost/SConscript
===================================================================
--- branches/bmesh/blender/intern/ghost/SConscript 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/intern/ghost/SConscript 2009-02-28 12:49:18 UTC (rev 19141)
@@ -14,7 +14,7 @@
for f in pf:
sources.remove('intern' + os.sep + f + 'Win32.cpp')
sources.remove('intern' + os.sep + f + 'Carbon.cpp')
-elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
+elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
for f in pf:
sources.remove('intern' + os.sep + f + 'X11.cpp')
sources.remove('intern' + os.sep + f + 'Carbon.cpp')
@@ -27,6 +27,6 @@
Exit()
incs = '. ../string ' + env['BF_OPENGL_INC']
-if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
+if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] )
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2009-02-28 12:49:18 UTC (rev 19141)
@@ -438,6 +438,8 @@
bool anyProcessed = false;
EventRef event;
+// SetMouseCoalescingEnabled(false, NULL);
+
do {
GHOST_TimerManager* timerMgr = getTimerManager();
@@ -469,7 +471,6 @@
}
}
-
/* end loop when no more events available */
while (::ReceiveNextEvent(0, NULL, 0, true, &event)==noErr) {
OSStatus status= ::SendEventToEventTarget(event, ::GetEventDispatcherTarget());
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2009-02-28 12:49:18 UTC (rev 19141)
@@ -378,6 +378,12 @@
case GHOST_kWindowStateMinimized:
::HideWindow(m_windowRef);
break;
+ case GHOST_kWindowStateModified:
+ SetWindowModified(m_windowRef, 1);
+ break;
+ case GHOST_kWindowStateUnModified:
+ SetWindowModified(m_windowRef, 0);
+ break;
case GHOST_kWindowStateMaximized:
case GHOST_kWindowStateNormal:
default:
Modified: branches/bmesh/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/source/Makefile
===================================================================
--- branches/bmesh/blender/source/Makefile 2009-02-28 10:23:36 UTC (rev 19140)
+++ branches/bmesh/blender/source/Makefile 2009-02-28 12:49:18 UTC (rev 19141)
@@ -242,7 +242,7 @@
PULIB += $(OCGDIR)/blender/ed_curve/libed_curve.a
PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a
PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
-PULIB += $(OCGDIR)/blender/ed_sculpt/libed_sculpt.a
+PULIB += $(OCGDIR)/blender/ed_sculpt_paint/libed_sculpt_paint.a
PULIB += $(OCGDIR)/blender/ed_physics/libed_physics.a
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list