[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38698] branches/bmesh/blender: svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Mon Jul 25 18:12:55 CEST 2011
Revision: 38698
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38698
Author: campbellbarton
Date: 2011-07-25 16:12:54 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37900
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
branches/bmesh/blender/release/scripts/modules/console/intellisense.py
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/collada/EffectExporter.cpp
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/render/render_internal.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/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/creator.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-37900
+ /trunk/blender:31524-38000
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/CMakeLists.txt 2011-07-25 16:12:54 UTC (rev 38698)
@@ -53,7 +53,6 @@
set(FIRST_RUN "TRUE")
endif()
-
# this starts out unset
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
@@ -145,7 +144,7 @@
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
# Audio/Video format support
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
if(APPLE OR (WIN32 AND NOT UNIX))
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
@@ -363,7 +362,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -407,18 +406,18 @@
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+ set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
mark_as_advanced(OPENCOLLADA)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
- set(PCRE /usr CACHE FILEPATH "PCRE Directory")
+ set(PCRE /usr CACHE PATH "PCRE Directory")
mark_as_advanced(PCRE)
set(PCRE_LIBPATH ${PCRE}/lib)
set(PCRE_LIB pcre)
- set(EXPAT /usr CACHE FILEPATH "Expat Directory")
+ set(EXPAT /usr CACHE PATH "Expat Directory")
mark_as_advanced(EXPAT)
set(EXPAT_LIBPATH ${EXPAT}/lib)
set(EXPAT_LIB expat)
@@ -615,9 +614,10 @@
set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
+ set(FREETYPE ${LIBDIR}/freetype)
set(FREETYPE_INCLUDE_DIRS
- ${FREETYPE}/include
- ${FREETYPE}/include/freetype2
+ ${LIBDIR}/freetype/include
+ ${LIBDIR}/freetype/include/freetype2
)
set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
@@ -714,7 +714,7 @@
set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
endif()
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib\;msvcmrt.lib\;msvcurt.lib\;msvcrtd.lib ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
@@ -723,7 +723,7 @@
set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
endif()
- set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib\;libc.lib")
+ set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
else()
# keep GCC spesific stuff here
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -181,7 +181,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib;msvcmrt.lib;msvcurt.lib;msvcrtd.lib']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -190,7 +190,7 @@
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib;msvcmrt.lib;msvcurt.lib;msvcrtd.lib']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
Modified: branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy/__init__.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/release/scripts/modules/bpy/__init__.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -22,24 +22,29 @@
Give access to blender data and utility functions.
"""
+__all__ = (
+ "app",
+ "context",
+ "data",
+ "ops",
+ "path",
+ "props",
+ "types",
+ "utils",
+)
+
+
# internal blender C module
-import _bpy
-from _bpy import types, props, app
+from _bpy import types, props, app, data, context
-data = _bpy.data
-context = _bpy.context
-
# python modules
-from . import utils, path
-from . import ops as _ops_module
+from . import utils, path, ops
# fake operator module
-ops = _ops_module.ops_fake_module
+ops = ops.ops_fake_module
-import sys as _sys
-
-
def _main():
+ import sys as _sys
# Possibly temp. addons path
from os.path import join, dirname, normpath
@@ -59,3 +64,5 @@
_main()
+
+del _main
\ No newline at end of file
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -287,7 +287,7 @@
else:
return v1[1], v2[1]
- if not PREF_FIX_LOOPS:
+ if not fix_loops:
'''
Normal single concave loop filling
'''
Modified: branches/bmesh/blender/release/scripts/modules/console/intellisense.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/console/intellisense.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/release/scripts/modules/console/intellisense.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -53,7 +53,7 @@
re.UNICODE)
-def complete(line, cursor, namespace, private=True):
+def complete(line, cursor, namespace, private):
"""Returns a list of possible completions:
* name completion
@@ -82,6 +82,9 @@
if RE_MODULE.match(line):
from . import complete_import
matches = complete_import.complete(line)
+ if not private:
+ matches[:] = [m for m in matches if m[:1] != "_"]
+ matches.sort()
else:
from . import complete_namespace
matches = complete_namespace.complete(word, namespace, private)
@@ -130,11 +133,15 @@
else:
# causes blender bug [#27495] since string keys may contain '.'
# scrollback = ' '.join([m.split('.')[-1] for m in matches])
+
+ # add white space to align with the cursor
+ white_space = " " + (" " * (cursor + len(prefix)))
word_prefix = word + prefix
- scrollback = ' '.join(
- [m[len(word_prefix):]
+ scrollback = '\n'.join(
+ [white_space + m[len(word_prefix):]
if (word_prefix and m.startswith(word_prefix))
- else m.split('.')[-1]
+ else
+ white_space + m.split('.')[-1]
for m in matches])
no_calltip = True
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-37900
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-38000
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/image.py 2011-07-25 15:44:41 UTC (rev 38697)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/image.py 2011-07-25 16:12:54 UTC (rev 38698)
@@ -60,7 +60,7 @@
filepath = bpy.path.abspath(self.filepath)
if not os.path.exists(filepath):
- self.report({'ERROR'}, "Image path %r not found." % filepath)
+ self.report({'ERROR'}, "Image path %r not found, image may be packed or unsaved." % filepath)
return {'CANCELLED'}
cmd = self._editor_guess(context) + [filepath]
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-37900
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-38000
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list