[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29708] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 29702.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Jun 26 15:39:44 CEST 2010
Revision: 29708
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29708
Author: kjym3
Date: 2010-06-26 15:39:43 +0200 (Sat, 26 Jun 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 29702.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29702
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/config/linux2-config.py
branches/soc-2008-mxcurioni/config/linuxcross-config.py
branches/soc-2008-mxcurioni/config/win32-vc-config.py
branches/soc-2008-mxcurioni/config/win64-vc-config.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/repath.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_linklist.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_inline.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/armature/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/armature/Makefile
branches/soc-2008-mxcurioni/source/blender/editors/armature/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen_types.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/targa.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.py
branches/soc-2008-mxcurioni/source/blender/python/generic/geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_cpu.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/cpu.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/doc/blender.1
branches/soc-2008-mxcurioni/release/scripts/modules/blend_render_info.py
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-06-26 13:39:43 UTC (rev 29708)
@@ -110,7 +110,7 @@
OPTION(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
-OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" OFF)
+OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
Modified: branches/soc-2008-mxcurioni/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linux2-config.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/config/linux2-config.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -168,7 +168,7 @@
WITH_BF_OPENMP = True
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
##
Modified: branches/soc-2008-mxcurioni/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linuxcross-config.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/config/linuxcross-config.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -169,7 +169,7 @@
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
Modified: branches/soc-2008-mxcurioni/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win32-vc-config.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/config/win32-vc-config.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -150,7 +150,7 @@
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
WITH_BF_STATICOPENGL = False
Modified: branches/soc-2008-mxcurioni/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win64-vc-config.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/config/win64-vc-config.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -163,7 +163,7 @@
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
WITH_BF_STATICOPENGL = False
Property changes on: branches/soc-2008-mxcurioni/doc/blender.1
___________________________________________________________________
Name: svn:mime-type
+ application/x-troff-man
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -19,6 +19,7 @@
import sys, os
import http, http.client, http.server, urllib, socket, socketserver, threading
import subprocess, shutil, time, hashlib
+import pickle
import select # for select.error
from netrender.utils import *
@@ -870,15 +871,19 @@
self.send_head(http.client.NO_CONTENT)
class RenderMasterServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
- def __init__(self, address, handler_class, path):
+ def __init__(self, address, handler_class, path, subdir=True):
super().__init__(address, handler_class)
self.jobs = []
self.jobs_map = {}
self.slaves = []
self.slaves_map = {}
self.job_id = 0
- self.path = path + "master_" + str(os.getpid()) + os.sep
+ if subdir:
+ self.path = path + "master_" + str(os.getpid()) + os.sep
+ else:
+ self.path = path
+
self.slave_timeout = 5 # 5 mins: need a parameter for that
self.balancer = netrender.balancing.Balancer()
@@ -892,6 +897,22 @@
if not os.path.exists(self.path):
os.mkdir(self.path)
+ def restore(self, jobs, slaves, balancer = None):
+ self.jobs = jobs
+ self.jobs_map = {}
+
+ for job in self.jobs:
+ self.jobs_map[job.id] = job
+ self.job_id = max(self.job_id, int(job.id))
+
+ self.slaves = slaves
+ for slave in self.slaves:
+ self.slaves_map[slave.id] = slave
+
+ if balancer:
+ self.balancer = balancer
+
+
def nextJobID(self):
self.job_id += 1
return str(self.job_id)
@@ -1010,8 +1031,29 @@
def clearMaster(path):
shutil.rmtree(path)
+def createMaster(address, clear, path):
+ filepath = os.path.join(path, "blender_master.data")
+
+ if not clear and os.path.exists(filepath):
+ print("loading saved master:", filepath)
+ with open(filepath, 'rb') as f:
+ path, jobs, slaves = pickle.load(f)
+
+ httpd = RenderMasterServer(address, RenderHandler, path, subdir=False)
+ httpd.restore(jobs, slaves)
+
+ return httpd
+
+ return RenderMasterServer(address, RenderHandler, path)
+
+def saveMaster(path, httpd):
+ filepath = os.path.join(path, "blender_master.data")
+
+ with open(filepath, 'wb') as f:
+ pickle.dump((httpd.path, httpd.jobs, httpd.slaves), f, pickle.HIGHEST_PROTOCOL)
+
def runMaster(address, broadcast, clear, path, update_stats, test_break):
- httpd = RenderMasterServer(address, RenderHandler, path)
+ httpd = createMaster(address, clear, path)
httpd.timeout = 1
httpd.stats = update_stats
@@ -1040,4 +1082,6 @@
httpd.server_close()
if clear:
clearMaster(httpd.path)
+ else:
+ saveMaster(path, httpd)
Modified: branches/soc-2008-mxcurioni/release/scripts/io/netrender/repath.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/io/netrender/repath.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/release/scripts/io/netrender/repath.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -47,7 +47,9 @@
new_path = path + ".remap" + ext
- all = main_file.filepath == main_file.original_path
+ # Disable for now. Partial repath should work anyway
+ #all = main_file.filepath != main_file.original_path
+ all = False
for rfile in job.files[1:]:
if all or rfile.original_path != rfile.filepath:
Property changes on: branches/soc-2008-mxcurioni/release/scripts/modules/blend_render_info.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -531,6 +531,11 @@
self.clear()
self.write(string)
+ @property
+ def users_logic(self):
+ """Logic bricks that use this text"""
+ import bpy
+ return tuple(obj for obj in bpy.data.objects if self in [cont.text for cont in obj.game.controllers if cont.type == 'PYTHON'])
import collections
Modified: branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -631,8 +631,10 @@
props = [(prop.identifier, prop) for prop in v.properties]
for prop_id, prop in sorted(props):
- data += "%s.%s: %s %s\n" % (struct_id_str, prop.identifier, prop.type, prop.description)
+ data += "%s.%s -> %s: %s%s %s\n" % (struct_id_str, prop.identifier, prop.identifier, prop.type, ", (read-only)" if prop.is_readonly else "", prop.description)
-
- text = bpy.data.texts.new(name="api.py")
- text.from_string(data)
+ if bpy.app.background:
+ print(data)
+ else:
+ text = bpy.data.texts.new(name="api.py")
+ text.from_string(data)
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py 2010-06-26 13:28:26 UTC (rev 29707)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py 2010-06-26 13:39:43 UTC (rev 29708)
@@ -367,22 +367,37 @@
text = context.curve
wide_ui = context.region.width > narrowui
+
+ split = layout.split()
+ col = split.column()
+ col.operator("font.textbox_add", icon='ZOOMIN')
+ if wide_ui:
+ col = split.column()
+
+ for i, box in enumerate(text.textboxes):
+
+ boxy = layout.box()
+
+ row = boxy.row()
+
+ split = row.split()
+
+ col = split.column(align=True)
- for box in text.textboxes:
- split = layout.box().split()
-
- col = split.column(align=True)
col.label(text="Dimensions:")
col.prop(box, "width", text="Width")
col.prop(box, "height", text="Height")
if wide_ui:
col = split.column(align=True)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list