[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37599] branches/soc-2011-salad: Merging r37518 through r37598 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Fri Jun 17 17:30:47 CEST 2011
Revision: 37599
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37599
Author: nazgul
Date: 2011-06-17 15:30:46 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Merging r37518 through r37598 from soc-2011-tomato into soc-2011-salad
Also corrected fix for blenderplayer compilation
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37598
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake
branches/soc-2011-salad/build_files/cmake/project_info.py
branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
branches/soc-2011-salad/doc/python_api/blender-org/layout.html
branches/soc-2011-salad/release/datafiles/blenderbuttons
branches/soc-2011-salad/release/scripts/modules/rna_prop_ui.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-salad/source/blender/blenkernel/intern/armature.c
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-salad/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-salad/source/blender/editors/include/UI_icons.h
branches/soc-2011-salad/source/blender/editors/include/UI_interface.h
branches/soc-2011-salad/source/blender/editors/interface/interface.c
branches/soc-2011-salad/source/blender/editors/interface/interface_layout.c
branches/soc-2011-salad/source/blender/editors/interface/interface_regions.c
branches/soc-2011-salad/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-salad/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-salad/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_header.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/space_file/file_draw.c
branches/soc-2011-salad/source/blender/editors/space_file/file_ops.c
branches/soc-2011-salad/source/blender/editors/space_file/filelist.c
branches/soc-2011-salad/source/blender/editors/space_file/filesel.c
branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
branches/soc-2011-salad/source/blender/editors/space_node/space_node.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-salad/source/blender/editors/transform/transform.h
branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-salad/source/blender/editors/transform/transform_snap.c
branches/soc-2011-salad/source/blender/imbuf/intern/util.c
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/python/generic/IDProp.c
branches/soc-2011-salad/source/blender/python/generic/IDProp.h
branches/soc-2011-salad/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-salad/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-salad/source/blender/python/intern/bpy_props.c
branches/soc-2011-salad/source/blender/python/intern/bpy_rna.c
branches/soc-2011-salad/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-salad/source/blender/python/intern/bpy_util.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-salad/source/blenderplayer/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_Camera.cpp
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37517
/trunk/blender:36834-37527
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37598
/trunk/blender:36834-37593
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-06-17 15:30:46 UTC (rev 37599)
@@ -50,7 +50,7 @@
cmake_minimum_required(VERSION 2.8)
# this starts out unset
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
Modified: branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-17 15:30:46 UTC (rev 37599)
@@ -1,4 +1,4 @@
-# - Find OpenEXR library (copied from FindTIFF.cmake, v 2.8.5)
+# - Find OpenEXR library
# Find the native OpenEXR includes and library
# This module defines
# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
@@ -7,6 +7,14 @@
# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
# This can also be an environment variable.
# OPENEXR_FOUND, If false, do not try to use OpenEXR.
+#
+# For indervidual library access these advanced settings are available
+# OPENEXR_HALF_LIBRARY, Path to Half library
+# OPENEXR_IEX_LIBRARY, Path to Half library
+# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
+# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
+# OPENEXR_IMATH_LIBRARY, Path to Imath library
+#
# also defined, but not for general use are
# OPENEXR_LIBRARY, where to find the OpenEXR library.
@@ -30,15 +38,18 @@
SET(_openexr_FIND_COMPONENTS
Half
+ Iex
IlmImf
- Iex
+ IlmThread
Imath
)
SET(_openexr_SEARCH_DIRS
${OPENEXR_ROOT_DIR}
/usr/local
- /opt/csw
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
)
FIND_PATH(OPENEXR_INCLUDE_DIR ImfXdr.h
@@ -54,7 +65,7 @@
FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT}
HINTS ${_openexr_SEARCH_DIRS}
- PATH_SUFFIXES lib
+ PATH_SUFFIXES lib64 lib
)
LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH()
@@ -63,14 +74,15 @@
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
- ${_openexr_LIBRARIES} OPENEXR_INCLUDE_DIR)
+ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
IF(OPENEXR_FOUND)
SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
ENDIF(OPENEXR_FOUND)
-MARK_AS_ADVANCED(
- ${_openexr_LIBRARIES}
- OPENEXR_INCLUDE_DIR
-)
+MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
+ENDFOREACH()
Modified: branches/soc-2011-salad/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-salad/build_files/cmake/project_info.py 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/build_files/cmake/project_info.py 2011-06-17 15:30:46 UTC (rev 37599)
@@ -105,7 +105,7 @@
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc"))
def is_c_any(filename):
Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py 2011-06-17 15:30:46 UTC (rev 37599)
@@ -184,7 +184,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']
+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/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py 2011-06-17 15:30:46 UTC (rev 37599)
@@ -191,7 +191,7 @@
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO']
+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/soc-2011-salad/doc/python_api/blender-org/layout.html
===================================================================
--- branches/soc-2011-salad/doc/python_api/blender-org/layout.html 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/doc/python_api/blender-org/layout.html 2011-06-17 15:30:46 UTC (rev 37599)
@@ -8,7 +8,7 @@
{%- macro relbar() %}
<div class="subnav boxheader">
- <ul class="noprint"><li><a href="http://www.blender.org/development/coding-guides/">Coding Guides</a></li><li>•</li><li><a href="http://www.blender.org/development/report-a-bug/">Report a Bug</a></li><li>•</li><li><a href="http://www.blender.org/development/submit-a-patch/">Submit a Patch</a></li><li>•</li><li><a href="http://www.blender.org/development/release-logs/">Release Logs</a></li><li>•</li><li><a href="http://www.blender.org/development/current-projects/">Current Projects</a></li><li>•</li><li><a href="http://www.blender.org/development/architecture/">Architecture</a></li><li>•</li><li><a href="http://www.blender.org/development/building-blender/">Building Blender</a></li><li>•</li><li class="subnav-active"><a href="http://www.blender.org/documentation/250PythonDoc/contents.html">PyAPI</a></li><li>•</li><li><a href="http://wiki.blender.org/index.php/Main_Page">Wiki</a></li></ul>
+ <ul class="noprint"><li><a href="http://wiki.blender.org/index.php/Dev:Contents">Documentation</a></li><li>•</li><li><a href="http://www.blender.org/development/report-a-bug/">Report a Bug</a></li><li>•</li><li><a href="http://wiki.blender.org/index.php/Dev:Doc/Process/Patches">Submit a Patch</a></li><li>•</li><li><a href="http://www.blender.org/development/release-logs/">Release Logs</a></li><li>•</li><li><a href="http://www.blender.org/development/building-blender/">Building Blender</a></li><li>•</li><li><a href="http://wiki.blender.org/index.php/Dev:Doc/Projects">Current Projects</a></li><li>•</li><li><a href="http://wiki.blender.org/index.php/Dev:Source/Architecture">Architecture</a></li><li>•</li><li><a href="http://www.blender.org/documentation/250PythonDoc/contents.html">Python API</a></li><li>•</li><li><a href="http://wiki.blender.org">Wiki</a></li></ul>
</div>
<div class="related subnav">
<h3>{{ _('Navigation') }}</h3>
Modified: branches/soc-2011-salad/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2011-salad/release/scripts/modules/rna_prop_ui.py
===================================================================
--- branches/soc-2011-salad/release/scripts/modules/rna_prop_ui.py 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/release/scripts/modules/rna_prop_ui.py 2011-06-17 15:30:46 UTC (rev 37599)
@@ -111,12 +111,16 @@
continue
row = layout.row()
- convert_to_pyobject = getattr(val, "convert_to_pyobject", None)
+ to_dict = getattr(val, "to_dict", None)
+ to_list = getattr(val, "to_list", None)
val_orig = val
- if convert_to_pyobject:
- val_draw = val = val.convert_to_pyobject()
- val_draw = str(val_draw)
+ if to_dict:
+ val = to_dict()
+ val_draw = str(val)
+ elif to_list:
+ val = to_list()
+ val_draw = str(val)
else:
val_draw = val
@@ -131,7 +135,7 @@
row.label(text=key)
# explicit exception for arrays
- if convert_to_pyobject and not hasattr(val_orig, "len"):
+ if to_dict or to_list:
row.label(text=val_draw)
else:
if key in rna_properties:
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py 2011-06-17 15:00:28 UTC (rev 37598)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py 2011-06-17 15:30:46 UTC (rev 37599)
@@ -118,8 +118,10 @@
# -------------------------------------------------------------------------
# Create action
+ # incase animation data hassnt been created
+ atd = obj.animation_data_create()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list