[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38296] branches/soc-2011-tomato: Merging r38265 through r38295 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Mon Jul 11 10:43:35 CEST 2011
Revision: 38296
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38296
Author: nazgul
Date: 2011-07-11 08:43:34 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
Merging r38265 through r38295 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38265
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38295
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/test/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/modules/bpyml_ui.py
branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-38264
+ /trunk/blender:36831-38295
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-07-11 08:43:34 UTC (rev 38296)
@@ -792,11 +792,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/gcc/openexr)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-
- # TODO, gives linking errors, force off
- set(WITH_IMAGE_OPENEXR OFF)
endif()
if(WITH_IMAGE_TIFF)
Modified: branches/soc-2011-tomato/intern/ghost/test/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/ghost/test/CMakeLists.txt 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/intern/ghost/test/CMakeLists.txt 2011-07-11 08:43:34 UTC (rev 38296)
@@ -82,9 +82,7 @@
"../../../source/blender/blenlib/intern/BLI_memarena.c"
)
-message(STATUS "EEEk ${SRC_NEW}")
-
find_package(OpenGL REQUIRED)
find_package(Freetype REQUIRED)
Modified: branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/addon_utils.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/addon_utils.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -48,8 +48,6 @@
def modules(module_cache):
import os
- import sys
- import time
path_list = paths()
@@ -173,11 +171,9 @@
:return: the loaded module or None on failier.
:rtype: module
"""
- # note, this still gets added to _bpy_types.TypeMap
import os
import sys
- import bpy_types as _bpy_types
import imp
def handle_error():
@@ -246,8 +242,6 @@
:type module_name: string
"""
import sys
- import bpy_types as _bpy_types
-
mod = sys.modules.get(module_name)
# possible this addon is from a previous session and didnt load a module this time.
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -29,7 +29,7 @@
op_get_rna = ops_module.get_rna
-class bpy_ops(object):
+class BPyOps(object):
'''
Fake module like class.
@@ -42,7 +42,7 @@
'''
if module.startswith('__'):
raise AttributeError(module)
- return bpy_ops_submodule(module)
+ return BPyOpsSubMod(module)
def __dir__(self):
@@ -67,7 +67,7 @@
return "<module like class 'bpy.ops'>"
-class bpy_ops_submodule(object):
+class BPyOpsSubMod(object):
'''
Utility class to fake submodules.
@@ -84,7 +84,7 @@
'''
if func.startswith('__'):
raise AttributeError(func)
- return bpy_ops_submodule_op(self.module, func)
+ return BPyOpsSubModOp(self.module, func)
def __dir__(self):
@@ -103,7 +103,7 @@
return "<module like class 'bpy.ops.%s'>" % self.module
-class bpy_ops_submodule_op(object):
+class BPyOpsSubModOp(object):
'''
Utility class to fake submodule operators.
@@ -151,7 +151,7 @@
self.func = func
def poll(self, *args):
- C_dict, C_exec = __class__._parse_args(args)
+ C_dict, C_exec = BPyOpsSubModOp._parse_args(args)
return op_poll(self.idname_py(), C_dict, C_exec)
def idname(self):
@@ -170,16 +170,16 @@
wm = context.window_manager
# run to account for any rna values the user changes.
- __class__._scene_update(context)
+ BPyOpsSubModOp._scene_update(context)
if args:
- C_dict, C_exec = __class__._parse_args(args)
+ C_dict, C_exec = BPyOpsSubModOp._parse_args(args)
ret = op_call(self.idname_py(), C_dict, kw, C_exec)
else:
ret = op_call(self.idname_py(), None, kw)
if 'FINISHED' in ret and context.window_manager == wm:
- __class__._scene_update(context)
+ BPyOpsSubModOp._scene_update(context)
return ret
@@ -208,4 +208,4 @@
return "<function bpy.ops.%s.%s at 0x%x'>" % \
(self.module, self.func, id(self))
-ops_fake_module = bpy_ops()
+ops_fake_module = BPyOps()
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -99,7 +99,7 @@
return _image_load(nfilepath)
if place_holder:
- image = bpy.data.images.new(os.path.basename(filepath), 128, 128)
+ image = bpy.data.images.new(os.path.basename(imagepath), 128, 128)
# allow the path to be resolved later
image.filepath = imagepath
return image
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -262,7 +262,7 @@
filepath_abs = filepath_cpy
mode = 'RELATIVE'
else:
- Excaption("invalid mode given %r" % mode)
+ raise Exception("invalid mode given %r" % mode)
if mode == 'ABSOLUTE':
return filepath_abs
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -212,8 +212,6 @@
if not hasattr(edges, "pop"):
edges = edges[:]
- edge_dict = {ed.key: ed for ed in mesh.edges if ed.select}
-
while edges:
current_edge = edges.pop()
vert_end, vert_start = current_edge.vertices[:]
@@ -300,7 +298,7 @@
if verts[i][1] == verts[i - 1][0]:
verts.pop(i - 1)
- fill = fill_polygon([verts])
+ fill = tesselate_polygon([verts])
else:
'''
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -22,7 +22,6 @@
"region_2d_to_vector_3d",
"region_2d_to_location_3d",
"location_3d_to_region_2d",
- "location_3d_to_region_2d",
)
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_types.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_types.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -241,7 +241,7 @@
chain.append(child)
else:
if len(children_basename):
- print("multiple basenames found, this is probably not what you want!", bone.name, children_basename)
+ print("multiple basenames found, this is probably not what you want!", self.name, children_basename)
break
Modified: branches/soc-2011-tomato/release/scripts/modules/bpyml_ui.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpyml_ui.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/bpyml_ui.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -22,7 +22,6 @@
import bpy as _bpy
import bpyml
from bpyml import TAG, ARGS, CHILDREN
-from types import ModuleType
_uilayout_rna = _bpy.types.UILayout.bl_rna
Modified: branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -114,7 +114,7 @@
to_dict = getattr(val, "to_dict", None)
to_list = getattr(val, "to_list", None)
- val_orig = val
+ # val_orig = val # UNUSED
if to_dict:
val = to_dict()
val_draw = str(val)
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -121,7 +121,6 @@
def execute(self, context):
import os
- import subprocess
EXT = "png" # could be made an option but for now ok
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py 2011-07-11 08:23:24 UTC (rev 38295)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py 2011-07-11 08:43:34 UTC (rev 38296)
@@ -87,8 +87,6 @@
def execute(self, context):
DIR = (self.direction == 'NEGATIVE')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list