[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36959] branches/soc-2011-onion: svn merge with trunk r36957
Ryakiotakis Antonis
kalast at gmail.com
Sat May 28 00:21:15 CEST 2011
Revision: 36959
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36959
Author: psy-fi
Date: 2011-05-27 22:21:14 +0000 (Fri, 27 May 2011)
Log Message:
-----------
svn merge with trunk r36957
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36957
Modified Paths:
--------------
branches/soc-2011-onion/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-onion/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-onion/build_files/cmake/project_info.py
branches/soc-2011-onion/build_files/scons/tools/Blender.py
branches/soc-2011-onion/build_files/scons/tools/btools.py
branches/soc-2011-onion/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/soc-2011-onion/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-onion/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-onion/release/scripts/modules/bpy_types.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-onion/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-onion/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-onion/source/blender/blenlib/BLI_string.h
branches/soc-2011-onion/source/blender/blenlib/intern/math_color.c
branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion/source/blender/blenlib/intern/string.c
branches/soc-2011-onion/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/editors/animation/keyingsets.c
branches/soc-2011-onion/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-onion/source/blender/editors/armature/poselib.c
branches/soc-2011-onion/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-onion/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-onion/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-onion/source/blender/editors/interface/interface.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion/source/blender/editors/object/object_edit.c
branches/soc-2011-onion/source/blender/editors/object/object_hook.c
branches/soc-2011-onion/source/blender/editors/object/object_modifier.c
branches/soc-2011-onion/source/blender/editors/object/object_relations.c
branches/soc-2011-onion/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion/source/blender/editors/space_file/space_file.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-onion/source/blender/imbuf/intern/util.c
branches/soc-2011-onion/source/blender/makesrna/RNA_access.h
branches/soc-2011-onion/source/blender/makesrna/RNA_define.h
branches/soc-2011-onion/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-onion/source/blender/makesrna/RNA_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-onion/source/blender/python/intern/bpy.c
branches/soc-2011-onion/source/blender/python/intern/bpy_interface.c
branches/soc-2011-onion/source/blender/python/intern/bpy_library.c
branches/soc-2011-onion/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion/source/creator/CMakeLists.txt
branches/soc-2011-onion/source/creator/creator.c
branches/soc-2011-onion/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-onion/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-onion/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-onion/source/gameengine/VideoTexture/VideoFFmpeg.h
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36833-36896
+ /trunk/blender:36833-36958
Modified: branches/soc-2011-onion/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/soc-2011-onion/build_files/cmake/cmake_netbeans_project.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/build_files/cmake/cmake_netbeans_project.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -33,7 +33,7 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, relpath, exists
def create_nb_project_main():
@@ -50,7 +50,6 @@
includes.sort()
PROJECT_NAME = "Blender"
- FILE_NAME = PROJECT_NAME.lower()
# --------------- NB spesific
defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -76,7 +75,7 @@
if not exists(PROJECT_DIR_NB):
os.mkdir(PROJECT_DIR_NB)
- SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+ # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
Modified: branches/soc-2011-onion/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-onion/build_files/cmake/cmake_qtcreator_project.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/build_files/cmake/cmake_qtcreator_project.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -34,54 +34,52 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
-
import sys
def create_qtc_project_main():
files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
if SIMPLE_PROJECTFILE:
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender"
- f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
- f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+ f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
else:
includes, defines = cmake_advanced_info()
# for some reason it doesnt give all internal includes
- includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
+ includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
includes.sort()
PROJECT_NAME = "Blender"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
f.write("\n".join(sorted(includes)))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
defines_final = [("#define %s %s" % item) for item in defines]
@@ -95,21 +93,21 @@
def create_qtc_project_python():
files = list(source_list(SOURCE_DIR, filename_check=is_py))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender_Python"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
Modified: branches/soc-2011-onion/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-onion/build_files/cmake/project_info.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/build_files/cmake/project_info.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -46,7 +46,7 @@
import sys
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, abspath, splitext, exists
SOURCE_DIR = join(dirname(__file__), "..", "..")
SOURCE_DIR = normpath(SOURCE_DIR)
Modified: branches/soc-2011-onion/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -449,10 +449,16 @@
shutil.rmtree(py_target, False, printexception)
exclude_re=[re.compile('.*/test/.*'),
re.compile('^config/.*'),
+ re.compile('^config-*/.*'),
re.compile('^distutils/.*'),
re.compile('^idlelib/.*'),
re.compile('^lib2to3/.*'),
- re.compile('^tkinter/.*')]
+ re.compile('^tkinter/.*'),
+ re.compile('^_tkinter_d.pyd'),
+ re.compile('^turtledemo'),
+ re.compile('^turtle.py'),
+ ]
+
print "Unpacking '" + py_tar + "' to '" + py_target + "'"
untar_pybundle(py_tar,py_target,exclude_re)
@@ -569,17 +575,17 @@
run("cp -R '%s' '%s'" % (py_src, os.path.dirname(py_target)))
run("rm -rf '%s/distutils'" % py_target)
run("rm -rf '%s/lib2to3'" % py_target)
- run("rm -rf '%s/idlelib'" % py_target)
- run("rm -rf '%s/tkinter'" % py_target)
run("rm -rf '%s/config'" % py_target)
-
+ run("rm -rf '%s/config-*'" % py_target)
run("rm -rf '%s/site-packages'" % py_target)
run("mkdir '%s/site-packages'" % py_target) # python needs it.'
+ run("rm -rf '%s/idlelib'" % py_target)
+ run("rm -rf '%s/tkinter'" % py_target)
+ run("rm -rf '%s/turtledemo'" % py_target)
+ run("rm -r '%s/turtle.py'" % py_target)
+ run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
- run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
- run("find '%s' -type d -name 'config-*' -prune -exec rm -rf {} ';'" % py_target)
- run("find '%s' -type d -name 'turtledemo' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
Modified: branches/soc-2011-onion/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/tools/btools.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/build_files/scons/tools/btools.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -615,10 +615,7 @@
else:
if len(df)>0:
dp_tmp = dp[l:]
- if dp_tmp.find('python\\lib') > -1:
- datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
- else:
- datafiles += "\n"+r'SetOutPath $BLENDERHOME'+dp[l:]+"\n\n"
+ datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
for f in df:
outfile = os.path.join(dp,f)
Modified: branches/soc-2011-onion/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
===================================================================
--- branches/soc-2011-onion/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py 2011-05-27 22:21:14 UTC (rev 36959)
@@ -23,7 +23,7 @@
setattr(data_to, attr, getattr(data_from, attr))
-# the 'data_to' variables lists are
+# the 'data_to' variables lists are
with bpy.data.libraries.load(filepath) as (data_from, data_to):
data_to.scenes = ["Scene"]
Modified: branches/soc-2011-onion/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2011-onion/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-27 21:46:10 UTC (rev 36958)
+++ branches/soc-2011-onion/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-27 22:21:14 UTC (rev 36959)
@@ -52,6 +52,10 @@
int read_length, data_size;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list