[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41928] branches/bmesh/blender: svn merge -r41899:41926 ^/trunk/blender.
Campbell Barton
ideasman42 at gmail.com
Wed Nov 16 20:06:39 CET 2011
Revision: 41928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41928
Author: campbellbarton
Date: 2011-11-16 19:06:38 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41899
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
branches/bmesh/blender/build_files/cmake/project_info.py
branches/bmesh/blender/extern/libmv/libmv-capi.cpp
branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/blender_util.h
branches/bmesh/blender/release/scripts/modules/bpy/path.py
branches/bmesh/blender/release/scripts/presets/camera/Sony_A55.py
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/render/intern/source/external_engine.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41899
+ /trunk/blender:39992-41926
Modified: branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-16 19:06:38 UTC (rev 41928)
@@ -139,9 +139,9 @@
# not used
# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+ENDIF()
- MARK_AS_ADVANCED(
- PYTHON_INCLUDE_DIR
- PYTHON_LIBRARY
- )
-ENDIF()
+MARK_AS_ADVANCED(
+ PYTHON_INCLUDE_DIR
+ PYTHON_LIBRARY
+)
Modified: branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py 2011-11-16 19:06:38 UTC (rev 41928)
@@ -89,7 +89,7 @@
f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8')
f.write("\n".join(sorted(includes)))
qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
@@ -104,7 +104,7 @@
defines_final += cmake_compiler_defines()
f.write("\n".join(defines_final))
- print("Blender project file written to: %s" % qtc_prj)
+ print("Blender project file written to: %r" % qtc_prj)
# --- end
@@ -133,7 +133,7 @@
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
- print("Python project file written to: %s" % qtc_prj)
+ print("Python project file written to: %r" % qtc_prj)
def main():
Modified: branches/bmesh/blender/build_files/cmake/project_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-16 19:06:38 UTC (rev 41928)
@@ -186,7 +186,7 @@
def cmake_cache_var(var):
- cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"))
+ cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"), encoding='utf-8')
lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
cache_file.close()
Modified: branches/bmesh/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv-capi.cpp 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/extern/libmv/libmv-capi.cpp 2011-11-16 19:06:38 UTC (rev 41928)
@@ -368,14 +368,11 @@
intrinsics->SetPrincipalPoint(principal_x, principal_y);
intrinsics->SetRadialDistortion(k1, k2, k3);
- if(focal_length) {
- /* do a lens undistortion if focal length is non-zero only */
- for (int i = 0; i < markers.size(); ++i) {
- intrinsics->InvertIntrinsics(markers[i].x,
- markers[i].y,
- &(markers[i].x),
- &(markers[i].y));
- }
+ for (int i = 0; i < markers.size(); ++i) {
+ intrinsics->InvertIntrinsics(markers[i].x,
+ markers[i].y,
+ &(markers[i].x),
+ &(markers[i].y));
}
libmv::Tracks normalized_tracks(markers);
Modified: branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt 2011-11-16 19:06:38 UTC (rev 41928)
@@ -1,4 +1,11 @@
+set(BLENDER_INCLUDE_DIRS
+ ${CMAKE_SOURCE_DIR}/intern/guardedalloc
+ ${CMAKE_SOURCE_DIR}/source/blender/makesdna
+ ${CMAKE_SOURCE_DIR}/source/blender/makesrna
+ ${CMAKE_SOURCE_DIR}/source/blender/blenloader
+ ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern)
+
set(INC
../render
../device
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-16 19:06:38 UTC (rev 41928)
@@ -459,7 +459,7 @@
@classmethod
def poll(cls, context):
- world = context.world
+ # world = context.world
return False # world and world.node_tree and CyclesButtonsPanel.poll(context)
def draw(self, context):
@@ -493,7 +493,7 @@
@classmethod
def poll(cls, context):
- mat = context.material
+ # mat = context.material
return False # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
def draw(self, context):
@@ -562,7 +562,7 @@
pin_id = space.pin_id
use_pin_id = space.use_pin_id
user = context.texture_user
- node = context.texture_node
+ # node = context.texture_node
if not use_pin_id or not isinstance(pin_id, bpy.types.Texture):
pin_id = None
@@ -638,7 +638,7 @@
def draw(self, context):
layout = self.layout
- tex = context.texture
+ # tex = context.texture
node = context.texture_node
mapping = node.texture_mapping
@@ -664,15 +664,15 @@
@classmethod
def poll(cls, context):
- tex = context.texture
- node = context.texture_node
+ # tex = context.texture
+ # node = context.texture_node
return False
#return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context)
def draw(self, context):
layout = self.layout
- tex = context.texture
+ # tex = context.texture
node = context.texture_node
mapping = node.color_mapping
Modified: branches/bmesh/blender/intern/cycles/blender/blender_util.h
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_util.h 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/intern/cycles/blender/blender_util.h 2011-11-16 19:06:38 UTC (rev 41928)
@@ -176,7 +176,13 @@
static inline string blender_absolute_path(BL::BlendData b_data, BL::ID b_id, const string& path)
{
if(path.size() >= 2 && path[0] == '/' && path[1] == '/') {
- string dirname = (b_id.library())? b_id.library().filepath(): b_data.filepath();
+ string dirname;
+
+ if(b_id.library())
+ dirname = blender_absolute_path(b_data, b_id.library(), b_id.library().filepath());
+ else
+ dirname = b_data.filepath();
+
return path_join(path_dirname(dirname), path.substr(2));
}
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41899
+ /trunk/blender/release:31524-41926
Modified: branches/bmesh/blender/release/scripts/modules/bpy/path.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy/path.py 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/release/scripts/modules/bpy/path.py 2011-11-16 19:06:38 UTC (rev 41928)
@@ -154,25 +154,23 @@
returning a string with the path if found else return the original path.
"""
- import os
-
def _ncase_path_found(path):
- if not path or os.path.exists(path):
+ if not path or _os.path.exists(path):
return path, True
# filename may be a directory or a file
- filename = os.path.basename(path)
- dirpath = os.path.dirname(path)
+ filename = _os.path.basename(path)
+ dirpath = _os.path.dirname(path)
suffix = path[:0] # "" but ensure byte/str match
if not filename: # dir ends with a slash?
if len(dirpath) < len(path):
suffix = path[:len(path) - len(dirpath)]
- filename = os.path.basename(dirpath)
- dirpath = os.path.dirname(dirpath)
+ filename = _os.path.basename(dirpath)
+ dirpath = _os.path.dirname(dirpath)
- if not os.path.exists(dirpath):
+ if not _os.path.exists(dirpath):
if dirpath == path:
return path, False
@@ -184,8 +182,8 @@
# at this point, the directory exists but not the file
# we are expecting 'dirpath' to be a directory, but it could be a file
- if os.path.isdir(dirpath):
- files = os.listdir(dirpath)
+ if _os.path.isdir(dirpath):
+ files = _os.listdir(dirpath)
else:
return path, False
@@ -198,7 +196,7 @@
break
if f_iter_nocase:
- return os.path.join(dirpath, f_iter_nocase) + suffix, True
+ return _os.path.join(dirpath, f_iter_nocase) + suffix, True
else:
# cant find the right one, just return the path as is.
return path, False
@@ -216,8 +214,7 @@
:arg case_sensitive: Check for matching case when comparing extensions.
:type case_sensitive: bool
"""
- import os
- fn_base, fn_ext = os.path.splitext(filepath)
+ fn_base, fn_ext = _os.path.splitext(filepath)
if fn_base and fn_ext:
if ((case_sensitive and ext == fn_ext) or
(ext.lower() == fn_ext.lower())):
Modified: branches/bmesh/blender/release/scripts/presets/camera/Sony_A55.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/camera/Sony_A55.py 2011-11-16 18:32:28 UTC (rev 41927)
+++ branches/bmesh/blender/release/scripts/presets/camera/Sony_A55.py 2011-11-16 19:06:38 UTC (rev 41928)
@@ -2,4 +2,3 @@
bpy.context.object.data.sensor_width = 23.4
bpy.context.object.data.sensor_height = 15.6
bpy.context.object.data.sensor_fit = 'HORIZONTAL'
-
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list