[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42140] branches/bmesh/blender: svn merge ^/trunk/blender -r42116:42139
Campbell Barton
ideasman42 at gmail.com
Thu Nov 24 21:01:49 CET 2011
Revision: 42140
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42140
Author: campbellbarton
Date: 2011-11-24 20:01:45 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42116:42139
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42116
Modified Paths:
--------------
branches/bmesh/blender/build_files/buildbot/master.cfg
branches/bmesh/blender/build_files/buildbot/slave_pack.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/addon/xml.py
branches/bmesh/blender/intern/tools/credits_svn_gen.py
branches/bmesh/blender/release/scripts/modules/addon_utils.py
branches/bmesh/blender/release/scripts/modules/bpy/utils.py
branches/bmesh/blender/release/scripts/modules/console/complete_calltip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/intern/CCGSubSurf.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenlib/intern/DLRB_tree.c
branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_style.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/gpu/CMakeLists.txt
branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.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/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/VideoTexture/Texture.cpp
branches/bmesh/blender/source/tests/pep8.py
Added Paths:
-----------
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D3S.py
Removed Paths:
-------------
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D35.py
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-42116
+ /trunk/blender:39992-42139
Modified: branches/bmesh/blender/build_files/buildbot/master.cfg
===================================================================
--- branches/bmesh/blender/build_files/buildbot/master.cfg 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/build_files/buildbot/master.cfg 2011-11-24 20:01:45 UTC (rev 42140)
@@ -75,14 +75,14 @@
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-def lib_svn_step(dir):
- return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
+def lib_svn_step(libdir):
+ return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir)
# generic builder
-def generic_builder(id, libdir='', branch=''):
- filename = 'buildbot_upload_' + id + '.zip'
+def generic_builder(idname, libdir='', branch=''):
+ filename = 'buildbot_upload_' + idname + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
pack_script = '../blender/build_files/buildbot/slave_pack.py'
@@ -93,10 +93,10 @@
if libdir != '':
f.addStep(lib_svn_step(libdir))
- f.addStep(Compile(command=['python', compile_script, id]))
- f.addStep(Test(command=['python', test_script, id]))
- f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
- if id.find('cmake') != -1:
+ f.addStep(Compile(command=['python', compile_script, idname]))
+ f.addStep(Test(command=['python', test_script, idname]))
+ f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged'))
+ if 'cmake' in idname:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
Modified: branches/bmesh/blender/build_files/buildbot/slave_pack.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/slave_pack.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/build_files/buildbot/slave_pack.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -84,12 +84,12 @@
sys.exit(retcode)
# clean release directory if it already exists
-dir = 'release'
+release_dir = 'release'
-if os.path.exists(dir):
- for f in os.listdir(dir):
- if os.path.isfile(os.path.join(dir, f)):
- os.remove(os.path.join(dir, f))
+if os.path.exists(release_dir):
+ for f in os.listdir(release_dir):
+ if os.path.isfile(os.path.join(release_dir, f)):
+ os.remove(os.path.join(release_dir, f))
# create release package
try:
@@ -99,16 +99,16 @@
sys.exit(1)
# find release directory, must exist this time
-if not os.path.exists(dir):
- sys.stderr.write("Failed to find release directory.\n")
+if not os.path.exists(release_dir):
+ sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
sys.exit(1)
# find release package
file = None
filepath = None
-for f in os.listdir(dir):
- rf = os.path.join(dir, f)
+for f in os.listdir(release_dir):
+ rf = os.path.join(release_dir, f)
if os.path.isfile(rf) and f.startswith('blender'):
file = f
filepath = rf
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -544,6 +544,7 @@
localopts.AddVariables(
(BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
+ (BoolVariable('WITH_BF_CYCLES_BINARIES', 'Build with precompiled CUDA binaries', False)),
(BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
(BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
Modified: branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -11,13 +11,13 @@
def createTexture(cont):
"""Create a new Dynamic Texture"""
- object = cont.owner
+ obj = cont.owner
# get the reference pointer (ID) of the internal texture
- ID = texture.materialID(object, 'IMoriginal.png')
+ ID = texture.materialID(obj, 'IMoriginal.png')
# create a texture object
- object_texture = texture.Texture(object, ID)
+ object_texture = texture.Texture(obj, ID)
# create a new source with an external image
url = logic.expandPath("//newtexture.jpg")
Modified: branches/bmesh/blender/intern/cycles/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/SConscript 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/cycles/SConscript 2011-11-24 20:01:45 UTC (rev 42140)
@@ -22,6 +22,9 @@
defs.append('WITH_MULTI')
defs.append('WITH_CUDA')
+if env['WITH_BF_CYCLES_BINARIES']:
+ defs.append('WITH_CUDA_BINARIES')
+
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
Modified: branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt 2011-11-24 20:01:45 UTC (rev 42140)
@@ -6,7 +6,7 @@
../kernel/svm
../util
../subd
- ../../../intern/guardedalloc
+ ../../guardedalloc
../../../source/blender/makesdna
../../../source/blender/makesrna
../../../source/blender/blenloader
Modified: branches/bmesh/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/properties.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/cycles/blender/addon/properties.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -19,7 +19,10 @@
# <pep8 compliant>
import bpy
-from bpy.props import *
+from bpy.props import (EnumProperty,
+ FloatProperty,
+ IntProperty,
+ PointerProperty)
import math
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -349,7 +349,7 @@
ntree = material.node_tree
for node in ntree.nodes:
- if hasattr(node, 'type') and node.type == nodetype:
+ if getattr(node, "type", None) == nodetype:
return node
return None
@@ -363,14 +363,14 @@
return None
-def panel_node_draw(layout, id, output_type, input_name):
- if not id.node_tree:
- layout.prop(id, "use_nodes", icon='NODETREE')
+def panel_node_draw(layout, id_data, output_type, input_name):
+ if not id_data.node_tree:
+ layout.prop(id_data, "use_nodes", icon='NODETREE')
return False
- ntree = id.node_tree
+ ntree = id_data.node_tree
- node = find_node(id, output_type)
+ node = find_node(id_data, output_type)
if not node:
layout.label(text="No output node.")
else:
Modified: branches/bmesh/blender/intern/cycles/blender/addon/xml.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/xml.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/cycles/blender/addon/xml.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -61,12 +61,12 @@
# get mesh
scene = context.scene
- object = context.object
+ obj = context.object
- if not object:
+ if not obj:
raise Exception("No active object")
- mesh = object.to_mesh(scene, True, 'PREVIEW')
+ mesh = obj.to_mesh(scene, True, 'PREVIEW')
if not mesh:
raise Exception("No mesh data in active object")
Modified: branches/bmesh/blender/intern/tools/credits_svn_gen.py
===================================================================
--- branches/bmesh/blender/intern/tools/credits_svn_gen.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/intern/tools/credits_svn_gen.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -258,6 +258,7 @@
for key, value in author_name_mapping.items():
if not value:
empty.append(key)
+e = None
for e in empty:
author_name_mapping[e] = e.title()
del empty, e
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42116
+ /trunk/blender/release:31524-42139
Modified: branches/bmesh/blender/release/scripts/modules/addon_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/addon_utils.py 2011-11-24 19:38:20 UTC (rev 42139)
+++ branches/bmesh/blender/release/scripts/modules/addon_utils.py 2011-11-24 20:01:45 UTC (rev 42140)
@@ -171,7 +171,9 @@
mod = None
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list