[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41263] branches/cycles: Cycles: svn merge -r41205:41225 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Oct 24 22:19:06 CEST 2011
Revision: 41263
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41263
Author: blendix
Date: 2011-10-24 20:19:04 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Cycles: svn merge -r41205:41225 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41205
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/intern/ffmpeg/ffmpeg_compat.h
branches/cycles/release/scripts/modules/bpy_types.py
branches/cycles/release/scripts/modules/console_python.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/cycles/release/scripts/startup/bl_ui/properties_scene.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/templates/driver_functions.py
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/intern/brush.c
branches/cycles/source/blender/blenlib/BLI_string_utf8.h
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenlib/intern/string_utf8.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/editors/animation/keyingsets.c
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/poseUtils.c
branches/cycles/source/blender/editors/armature/poselib.c
branches/cycles/source/blender/editors/armature/poseobject.c
branches/cycles/source/blender/editors/include/ED_keyframing.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_ops.c
branches/cycles/source/blender/editors/object/object_transform.c
branches/cycles/source/blender/editors/render/render_preview.c
branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/render/intern/source/rayshade.c
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/gameengine/Physics/common/PHY_IMotionState.h
branches/cycles/source/tools/spell_check_source_config.py
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/source/blender/blenlib/intern/storage.c
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41205
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41225
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-10-24 20:16:18 UTC (rev 41262)
+++ branches/cycles/CMakeLists.txt 2011-10-24 20:19:04 UTC (rev 41263)
@@ -223,10 +223,7 @@
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
-option(WITH_PYTHON_UI_INFO "Allow navigating to UI source from the context menu" OFF)
-mark_as_advanced(WITH_PYTHON_UI_INFO)
-
if(APPLE)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
@@ -1456,10 +1453,6 @@
add_definitions(-DWITH_ASSERT_ABORT)
endif()
-if(WITH_PYTHON_UI_INFO)
- add_definitions(-DWITH_PYTHON_UI_INFO)
-endif()
-
# message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}")
# message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}")
Property changes on: branches/cycles/intern
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/intern:36353-41205
/trunk/intern:37695-37700
+ /trunk/blender/intern:36353-41225
/trunk/intern:37695-37700
Modified: branches/cycles/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/cycles/intern/ffmpeg/ffmpeg_compat.h 2011-10-24 20:16:18 UTC (rev 41262)
+++ branches/cycles/intern/ffmpeg/ffmpeg_compat.h 2011-10-24 20:19:04 UTC (rev 41263)
@@ -29,7 +29,7 @@
/* check our ffmpeg is new enough, avoids user complaints */
#if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64))
-# error "FFmpeg 0.7 or newer is needed, Upgrade you're FFmpeg or disable it"
+# error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it"
#endif
/* end sanity check */
Property changes on: branches/cycles/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:36353-41205
/trunk/release:37695-37700
+ /trunk/blender/release:36353-41225
/trunk/release:37695-37700
Modified: branches/cycles/release/scripts/modules/bpy_types.py
===================================================================
--- branches/cycles/release/scripts/modules/bpy_types.py 2011-10-24 20:16:18 UTC (rev 41262)
+++ branches/cycles/release/scripts/modules/bpy_types.py 2011-10-24 20:19:04 UTC (rev 41263)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8 compliant>
+# <pep8-80 compliant>
from _bpy import types as bpy_types
import _bpy
@@ -34,7 +34,8 @@
def copy(self):
from types import BuiltinMethodType
new_context = {}
- generic_attrs = list(StructRNA.__dict__.keys()) + ["bl_rna", "rna_type", "copy"]
+ generic_attrs = (list(StructRNA.__dict__.keys()) +
+ ["bl_rna", "rna_type", "copy"])
for attr in dir(self):
if not (attr.startswith("_") or attr in generic_attrs):
value = getattr(self, attr)
@@ -52,14 +53,19 @@
"""ID data blocks which use this library"""
import bpy
- # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE, we could make this an attribute in rna.
- attr_links = "actions", "armatures", "brushes", "cameras", \
- "curves", "grease_pencil", "groups", "images", \
- "lamps", "lattices", "materials", "metaballs", \
- "meshes", "node_groups", "objects", "scenes", \
- "sounds", "speakers", "textures", "texts", "fonts", "worlds"
+ # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE,
+ # we could make this an attribute in rna.
+ attr_links = ("actions", "armatures", "brushes", "cameras",
+ "curves", "grease_pencil", "groups", "images",
+ "lamps", "lattices", "materials", "metaballs",
+ "meshes", "node_groups", "objects", "scenes",
+ "sounds", "speakers", "textures", "texts",
+ "fonts", "worlds")
- return tuple(id_block for attr in attr_links for id_block in getattr(bpy.data, attr) if id_block.library == self)
+ return tuple(id_block
+ for attr in attr_links
+ for id_block in getattr(bpy.data, attr)
+ if id_block.library == self)
class Texture(bpy_types.ID):
@@ -69,13 +75,21 @@
def users_material(self):
"""Materials that use this texture"""
import bpy
- return tuple(mat for mat in bpy.data.materials if self in [slot.texture for slot in mat.texture_slots if slot])
+ return tuple(mat for mat in bpy.data.materials
+ if self in [slot.texture
+ for slot in mat.texture_slots
+ if slot]
+ )
@property
def users_object_modifier(self):
"""Object modifiers that use this texture"""
import bpy
- return tuple(obj for obj in bpy.data.objects if self in [mod.texture for mod in obj.modifiers if mod.type == 'DISPLACE'])
+ return tuple(obj for obj in bpy.data.objects if
+ self in [mod.texture
+ for mod in obj.modifiers
+ if mod.type == 'DISPLACE']
+ )
class Group(bpy_types.ID):
@@ -85,7 +99,8 @@
def users_dupli_group(self):
"""The dupli group this group is used in"""
import bpy
- return tuple(obj for obj in bpy.data.objects if self == obj.dupli_group)
+ return tuple(obj for obj in bpy.data.objects
+ if self == obj.dupli_group)
class Object(bpy_types.ID):
@@ -95,19 +110,22 @@
def children(self):
"""All the children of this object"""
import bpy
- return tuple(child for child in bpy.data.objects if child.parent == self)
+ return tuple(child for child in bpy.data.objects
+ if child.parent == self)
@property
def users_group(self):
"""The groups this object is in"""
import bpy
- return tuple(group for group in bpy.data.groups if self in group.objects[:])
+ return tuple(group for group in bpy.data.groups
+ if self in group.objects[:])
@property
def users_scene(self):
"""The scenes this object is in"""
import bpy
- return tuple(scene for scene in bpy.data.scenes if self in scene.objects[:])
+ return tuple(scene for scene in bpy.data.scenes
+ if self in scene.objects[:])
class _GenericBone:
@@ -118,13 +136,14 @@
__slots__ = ()
def translate(self, vec):
- """Utility function to add *vec* to the head and tail of this bone."""
+ """Utility function to add *vec* to the head and tail of this bone"""
self.head += vec
self.tail += vec
def parent_index(self, parent_test):
"""
- The same as 'bone in other_bone.parent_recursive' but saved generating a list.
+ The same as 'bone in other_bone.parent_recursive'
+ but saved generating a list.
"""
# use the name so different types can be tested.
name = parent_test.name
@@ -187,7 +206,9 @@
@property
def length(self):
- """The distance from head to tail, when set the head is moved to fit the length."""
+ """ The distance from head to tail,
+ when set the head is moved to fit the length.
+ """
return self.vector.length
@length.setter
@@ -196,7 +217,9 @@
@property
def vector(self):
- """The direction this bone is pointing. Utility function for (tail - head)"""
+ """ The direction this bone is pointing.
+ Utility function for (tail - head)
+ """
return (self.tail - self.head)
@property
@@ -222,7 +245,8 @@
"""
Returns a chain of children with the same base name as this bone.
Only direct chains are supported, forks caused by multiple children
- with matching base names will terminate the function and not be returned.
+ with matching base names will terminate the function
+ and not be returned.
"""
basename = self.basename
chain = []
@@ -241,7 +265,9 @@
chain.append(child)
else:
if len(children_basename):
- print("multiple basenames found, this is probably not what you want!", self.name, children_basename)
+ print("multiple basenames found, "
+ "this is probably not what you want!",
+ self.name, children_basename)
break
@@ -284,13 +310,18 @@
def transform(self, matrix, scale=True, roll=True):
"""
- Transform the the bones head, tail, roll and envelope (when the matrix has a scale component).
+ Transform the the bones head, tail, roll and envelope
+ (when the matrix has a scale component).
:arg matrix: 3x3 or 4x4 transformation matrix.
:type matrix: :class:`mathutils.Matrix`
:arg scale: Scale the bone envelope by the matrix.
:type scale: bool
- :arg roll: Correct the roll to point in the same relative direction to the head and tail.
+ :arg roll:
+
+ Correct the roll to point in the same relative
+ direction to the head and tail.
+
:type roll: bool
"""
from mathutils import Vector
@@ -321,11 +352,23 @@
Make a mesh from a list of vertices/edges/faces
Until we have a nicer way to make geometry, use this.
- :arg vertices: float triplets each representing (X, Y, Z) eg: [(0.0, 1.0, 0.5), ...].
+ :arg vertices:
+
+ float triplets each representing (X, Y, Z)
+ eg: [(0.0, 1.0, 0.5), ...].
+
:type vertices: iterable object
- :arg edges: int pairs, each pair contains two indices to the *vertices* argument. eg: [(1, 2), ...]
+ :arg edges:
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list