[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42160] branches/soc-2011-tomato: Merging r42062 through r42159 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Nov 25 16:32:26 CET 2011
Revision: 42160
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42160
Author: nazgul
Date: 2011-11-25 15:32:23 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Merging r42062 through r42159 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42062
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42159
Modified Paths:
--------------
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/build_files/buildbot/master.cfg
branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
branches/soc-2011-tomato/doc/python_api/rst/gpu.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/extern/libmv/SConscript
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/SConscript
branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/addon/xml.py
branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-tomato/intern/cycles/device/device.h
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl
branches/soc-2011-tomato/intern/cycles/render/filter.cpp
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
branches/soc-2011-tomato/intern/cycles/util/util_path.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
branches/soc-2011-tomato/release/scripts/modules/console/complete_calltip.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.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/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-tomato/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/InstanceWriter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-tomato/source/blender/editors/render/render_update.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_define.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-tomato/source/tests/pep8.py
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/presets/camera/Nikon_D3S.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42061
+ /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42159
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/GNUmakefile 2011-11-25 15:32:23 UTC (rev 42160)
@@ -93,6 +93,17 @@
# -----------------------------------------------------------------------------
+# Tool for 'make config'
+
+# X11 spesific
+ifdef DISPLAY
+ CMAKE_CONFIG_TOOL = cmake-gui
+else
+ CMAKE_CONFIG_TOOL = ccmake
+endif
+
+
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@@ -115,8 +126,15 @@
headless: all
bpy: all
+
# -----------------------------------------------------------------------------
-# Helo for build targets
+# Configuration (save some cd'ing around)
+config:
+ $(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+
+
+# -----------------------------------------------------------------------------
+# Help for build targets
help:
@echo ""
@echo "Convenience targets provided for building blender, (multiple at once can be used)"
@@ -125,6 +143,8 @@
@echo " * headless - build without an interface (renderfarm or server automation)"
@echo " * bpy - build as a python module which can be loaded from python directly"
@echo ""
+ @echo " * config - run cmake configuration tool to set build options"
+ @echo ""
@echo " Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
@echo " Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
@echo ""
Modified: branches/soc-2011-tomato/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-11-25 15:32:23 UTC (rev 42160)
@@ -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/soc-2011-tomato/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2011-11-25 15:32:23 UTC (rev 42160)
@@ -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/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-11-25 15:32:23 UTC (rev 42160)
@@ -319,20 +319,11 @@
incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
defs = []
- if env['WITH_BF_QUICKTIME']:
- incs.append(env['BF_QUICKTIME_INC'])
- defs.append('WITH_QUICKTIME')
if env['WITH_BF_BINRELOC']:
incs.append('#/extern/binreloc/include')
defs.append('WITH_BINRELOC')
- if env['WITH_BF_OPENEXR']:
- defs.append('WITH_OPENEXR')
-
- if env['WITH_BF_TIFF']:
- defs.append('WITH_TIFF')
-
if env['WITH_BF_SDL']:
defs.append('WITH_SDL')
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-11-25 15:32:23 UTC (rev 42160)
@@ -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/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-11-25 15:32:23 UTC (rev 42160)
@@ -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/soc-2011-tomato/doc/python_api/rst/gpu.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/gpu.rst 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/doc/python_api/rst/gpu.rst 2011-11-25 15:32:23 UTC (rev 42160)
@@ -278,7 +278,7 @@
.. data:: CD_MTFACE
- Vertex attribute is a UV layer. Data type is vector of 2 float.
+ Vertex attribute is a UV Map. Data type is vector of 2 float.
There can be more than one attribute of that type, they are differenciated by name.
In blender, you can retrieve the attribute data with:
@@ -495,10 +495,10 @@
for uniform in shader['uniforms']:
if uniform['type'] == gpu.GPU_DYNAMIC_SAMPLER_2DIMAGE:
print("uniform {0} is using image {1}".format(uniform['varname'], uniform['image'].filepath))
- # scan the attribute list and find the UV layer used in the shader
+ # scan the attribute list and find the UV Map used in the shader
for attribute in shader['attributes']:
if attribute['type'] == gpu.CD_MTFACE:
- print("attribute {0} is using UV layer {1}".format(attribute['varname'], attribute['name']))
+ print("attribute {0} is using UV Map {1}".format(attribute['varname'], attribute['name']))
*****
Notes
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-11-25 13:28:04 UTC (rev 42159)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-11-25 15:32:23 UTC (rev 42160)
@@ -110,7 +110,13 @@
("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"),
)
+# only support for properties atm.
+RNA_BLACKLIST = {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list