[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28458] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28425 :28457, note: missing changes from properties_particle.py
Campbell Barton
ideasman42 at gmail.com
Tue Apr 27 12:00:44 CEST 2010
Revision: 28458
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28458
Author: campbellbarton
Date: 2010-04-27 12:00:44 +0200 (Tue, 27 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28425:28457, note: missing changes from properties_particle.py
Modified Paths:
--------------
branches/render25/extern/libopenjpeg/opj_malloc.h
branches/render25/release/scripts/io/netrender/master.py
branches/render25/release/scripts/io/netrender/master_html.py
branches/render25/release/scripts/io/netrender/slave.py
branches/render25/release/scripts/io/netrender/ui.py
branches/render25/release/scripts/op/add_mesh_torus.py
branches/render25/release/scripts/ui/properties_data_armature.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/makesrna/intern/rna_gpencil.c
branches/render25/source/blender/python/generic/mathutils.c
branches/render25/source/blender/python/generic/mathutils.h
branches/render25/source/blender/python/generic/mathutils_color.c
branches/render25/source/blender/python/generic/mathutils_euler.c
branches/render25/source/blender/python/generic/mathutils_matrix.c
branches/render25/source/blender/python/generic/mathutils_quat.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/render25/source/gameengine/Ketsji/KX_ObjectActuator.cpp
Added Paths:
-----------
branches/render25/extern/libopenjpeg/patches/fbsd.patch
Modified: branches/render25/extern/libopenjpeg/opj_malloc.h
===================================================================
--- branches/render25/extern/libopenjpeg/opj_malloc.h 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/extern/libopenjpeg/opj_malloc.h 2010-04-27 10:00:44 UTC (rev 28458)
@@ -76,7 +76,7 @@
#if defined(__sun)
#define HAVE_MEMALIGN
#elif defined(__GNUC__)
- #ifndef __APPLE__
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
#define HAVE_MEMALIGN
#include <malloc.h>
#endif
Copied: branches/render25/extern/libopenjpeg/patches/fbsd.patch (from rev 28457, trunk/blender/extern/libopenjpeg/patches/fbsd.patch)
===================================================================
--- branches/render25/extern/libopenjpeg/patches/fbsd.patch (rev 0)
+++ branches/render25/extern/libopenjpeg/patches/fbsd.patch 2010-04-27 10:00:44 UTC (rev 28458)
@@ -0,0 +1,13 @@
+Index: extern/libopenjpeg/opj_malloc.h
+===================================================================
+--- extern/libopenjpeg/opj_malloc.h (revision 27736)
++++ extern/libopenjpeg/opj_malloc.h (working copy)
+@@ -76,7 +76,7 @@
+ #if defined(__sun)
+ #define HAVE_MEMALIGN
+ #elif defined(__GNUC__)
+- #ifndef __APPLE__
++ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #define HAVE_MEMALIGN
+ #include <malloc.h>
+ #endif
Modified: branches/render25/release/scripts/io/netrender/master.py
===================================================================
--- branches/render25/release/scripts/io/netrender/master.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/io/netrender/master.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -190,6 +190,11 @@
edit_pattern = re.compile("/edit_([a-zA-Z0-9]+)")
class RenderHandler(http.server.BaseHTTPRequestHandler):
+ def log_message(self, format, *args):
+ # override because the original calls self.address_string(), which
+ # is extremely slow due to some timeout..
+ sys.stderr.write("[%s] %s\n" % (self.log_date_time_string(), format%args))
+
def send_head(self, code = http.client.OK, headers = {}, content = "application/octet-stream"):
self.send_response(code)
self.send_header("Content-type", content)
@@ -1010,7 +1015,7 @@
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
- start_time = time.time()
+ start_time = time.time() - 2
while not test_break():
try:
@@ -1018,7 +1023,7 @@
except select.error:
pass
- if time.time() - start_time >= 10: # need constant here
+ if time.time() - start_time >= 2: # need constant here
httpd.timeoutSlaves()
httpd.updateUsage()
@@ -1031,3 +1036,4 @@
httpd.server_close()
if clear:
clearMaster(httpd.path)
+
Modified: branches/render25/release/scripts/io/netrender/master_html.py
===================================================================
--- branches/render25/release/scripts/io/netrender/master_html.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/io/netrender/master_html.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -29,6 +29,7 @@
def head(title):
output("<html><head>")
+ output("<meta http-equiv='refresh' content=5>")
output("<script src='/html/netrender.js' type='text/javascript'></script>")
# output("<script src='/html/json2.js' type='text/javascript'></script>")
output("<title>")
Modified: branches/render25/release/scripts/io/netrender/slave.py
===================================================================
--- branches/render25/release/scripts/io/netrender/slave.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/io/netrender/slave.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -105,6 +105,8 @@
if not os.path.exists(NODE_PREFIX):
os.mkdir(NODE_PREFIX)
+ engine.update_stats("", "Network render connected to master, waiting for jobs")
+
while not engine.test_break():
conn.request("GET", "/job", headers={"slave-id":slave_id})
response = conn.getresponse()
@@ -113,6 +115,7 @@
timeout = 1 # reset timeout on new job
job = netrender.model.RenderJob.materialize(eval(str(response.read(), encoding='utf8')))
+ engine.update_stats("", "Network render processing job from master")
JOB_PREFIX = NODE_PREFIX + "job_" + job.id + os.sep
if not os.path.exists(JOB_PREFIX):
@@ -245,6 +248,8 @@
conn.request("PUT", "/render", headers=headers)
if conn.getresponse().status == http.client.NO_CONTENT:
continue
+
+ engine.update_stats("", "Network render connected to master, waiting for jobs")
else:
if timeout < MAX_TIMEOUT:
timeout += INCREMENT_TIMEOUT
Modified: branches/render25/release/scripts/io/netrender/ui.py
===================================================================
--- branches/render25/release/scripts/io/netrender/ui.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/io/netrender/ui.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -213,9 +213,10 @@
def poll(self, context):
scene = context.scene
netsettings = scene.network_render
+ if netsettings.mode != "RENDER_CLIENT":
+ return False
verify_address(netsettings)
return (super().poll(context)
- and netsettings.mode == "RENDER_CLIENT"
and netsettings.server_address != "[default]")
def draw(self, context):
@@ -251,9 +252,10 @@
def poll(self, context):
scene = context.scene
netsettings = scene.network_render
+ if netsettings.mode != "RENDER_CLIENT":
+ return False
verify_address(netsettings)
return (super().poll(context)
- and netsettings.mode == "RENDER_CLIENT"
and netsettings.server_address != "[default]")
def draw(self, context):
@@ -288,9 +290,10 @@
def poll(self, context):
scene = context.scene
netsettings = scene.network_render
+ if netsettings.mode != "RENDER_CLIENT":
+ return False
verify_address(netsettings)
return (super().poll(context)
- and netsettings.mode == "RENDER_CLIENT"
and netsettings.server_address != "[default]")
def draw(self, context):
Modified: branches/render25/release/scripts/op/add_mesh_torus.py
===================================================================
--- branches/render25/release/scripts/op/add_mesh_torus.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/op/add_mesh_torus.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -42,7 +42,7 @@
vec = Vector((major_rad + (cos(angle) * minor_rad), 0.0,
(sin(angle) * minor_rad))) * quat
- verts.extend([vec.x, vec.y, vec.z])
+ verts.extend(vec[:])
if minor_index + 1 == minor_seg:
i2 = (major_index) * minor_seg
Modified: branches/render25/release/scripts/ui/properties_data_armature.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_armature.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/ui/properties_data_armature.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -69,7 +69,10 @@
arm = context.armature
wide_ui = context.region.width > narrowui
- layout.prop(arm, "pose_position", expand=True)
+ if wide_ui:
+ layout.prop(arm, "pose_position", expand=True)
+ else:
+ layout.prop(arm, "pose_position", text="")
split = layout.split()
@@ -79,11 +82,16 @@
col.label(text="Protected Layers:")
col.prop(arm, "layer_protection", text="")
- if wide_ui:
- col = split.column()
col.label(text="Deform:")
+
+ split = layout.split()
+
+ col = split.column()
col.prop(arm, "deform_vertexgroups", text="Vertex Groups")
col.prop(arm, "deform_envelope", text="Envelopes")
+
+ if wide_ui:
+ col = split.column()
col.prop(arm, "deform_quaternion", text="Quaternion")
col.prop(arm, "deform_bbone_rest", text="B-Bones Rest")
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-04-27 10:00:44 UTC (rev 28458)
@@ -1848,8 +1848,6 @@
scene = context.scene
col = layout.column()
- col.label(text="Camera:")
- col.prop(view, "camera", text="")
col.prop(view, "lens")
col.label(text="Lock to Object:")
col.prop(view, "lock_object", text="")
@@ -1861,6 +1859,11 @@
col.prop(view, "clip_start", text="Start")
col.prop(view, "clip_end", text="End")
+ subcol = col.column()
+ subcol.enabled = not view.lock_camera_and_layers
+ subcol.label(text="Local Camera:")
+ subcol.prop(view, "camera", text="")
+
layout.column().prop(view, "cursor_location")
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c 2010-04-27 09:54:36 UTC (rev 28457)
+++ branches/render25/source/blender/blenloader/intern/readfile.c 2010-04-27 10:00:44 UTC (rev 28458)
@@ -3898,6 +3898,11 @@
/* weak weak... this was only meant as draw flag, now is used in give_base too */
ob->flag &= ~OB_FROMGROUP;
+
+ /* loading saved files with editmode enabled works, but for undo we like
+ to stay in object mode during undo presses so keep editmode disabled */
+ if(fd->memfile)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list