[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29588] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r29546:29587
Campbell Barton
ideasman42 at gmail.com
Mon Jun 21 11:02:56 CEST 2010
Revision: 29588
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29588
Author: campbellbarton
Date: 2010-06-21 11:02:56 +0200 (Mon, 21 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29546:29587
Modified Paths:
--------------
branches/render25/release/scripts/io/netrender/master.py
branches/render25/release/scripts/io/netrender/repath.py
branches/render25/release/scripts/modules/bpy_types.py
branches/render25/release/scripts/modules/rna_info.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/editors/armature/armature_intern.h
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/armature/editarmature_sketch.c
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/render25/source/gameengine/Ketsji/KX_ObjectActuator.cpp
Modified: branches/render25/release/scripts/io/netrender/master.py
===================================================================
--- branches/render25/release/scripts/io/netrender/master.py 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/release/scripts/io/netrender/master.py 2010-06-21 09:02:56 UTC (rev 29588)
@@ -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/render25/release/scripts/io/netrender/repath.py
===================================================================
--- branches/render25/release/scripts/io/netrender/repath.py 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/release/scripts/io/netrender/repath.py 2010-06-21 09:02:56 UTC (rev 29588)
@@ -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:
Modified: branches/render25/release/scripts/modules/bpy_types.py
===================================================================
--- branches/render25/release/scripts/modules/bpy_types.py 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/release/scripts/modules/bpy_types.py 2010-06-21 09:02:56 UTC (rev 29588)
@@ -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/render25/release/scripts/modules/rna_info.py
===================================================================
--- branches/render25/release/scripts/modules/rna_info.py 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/release/scripts/modules/rna_info.py 2010-06-21 09:02:56 UTC (rev 29588)
@@ -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/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-06-21 09:02:56 UTC (rev 29588)
@@ -2168,6 +2168,7 @@
col.prop(toolsettings, "etch_autoname")
col.prop(toolsettings, "etch_number")
col.prop(toolsettings, "etch_side")
+ col.operator("sketch.convert", text="Convert")
class VIEW3D_PT_context_properties(bpy.types.Panel):
Modified: branches/render25/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/blender.c 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/source/blender/blenkernel/intern/blender.c 2010-06-21 09:02:56 UTC (rev 29588)
@@ -65,7 +65,6 @@
#include "BKE_global.h"
#include "BKE_idprop.h"
#include "BKE_library.h"
-#include "BKE_ipo.h"
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_report.h"
@@ -287,10 +286,6 @@
//setscreen(G.curscreen);
}
- // XXX temporarily here
- if(G.main->versionfile < 250)
- do_versions_ipos_to_animato(G.main); // XXX fixme... complicated versionpatching
-
if(recover && bfd->filename[0] && G.relbase_valid) {
/* in case of autosave or quit.blend, use original filename instead
* use relbase_valid to make sure the file is saved, else we get <memory2> in the filename */
Modified: branches/render25/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/object.c 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/source/blender/blenkernel/intern/object.c 2010-06-21 09:02:56 UTC (rev 29588)
@@ -337,7 +337,7 @@
ModifierData *md;
ARegion *ar;
RegionView3D *rv3d;
- int a;
+ int a, found;
unlink_controllers(&ob->controllers);
unlink_actuators(&ob->actuators);
@@ -609,28 +609,37 @@
while(sa) {
SpaceLink *sl;
- if (sa->spacetype == SPACE_VIEW3D) {
- for (ar= sa->regionbase.first; ar; ar= ar->next) {
- if (ar->regiontype==RGN_TYPE_WINDOW) {
- rv3d= (RegionView3D *)ar->regiondata;
- if (rv3d->persp == RV3D_CAMOB)
- rv3d->persp= RV3D_PERSP;
- if (rv3d->localvd && rv3d->localvd->persp == RV3D_CAMOB)
- rv3d->localvd->persp= RV3D_PERSP;
- }
- }
- }
-
for (sl= sa->spacedata.first; sl; sl= sl->next) {
if(sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D*) sl;
+ found= 0;
if(v3d->camera==ob) {
v3d->camera= NULL;
+ found= 1;
}
if(v3d->localvd && v3d->localvd->camera==ob ) {
v3d->localvd->camera= NULL;
+ found += 2;
}
+
+ if (found) {
+ if (sa->spacetype == SPACE_VIEW3D) {
+ for (ar= sa->regionbase.first; ar; ar= ar->next) {
+ if (ar->regiontype==RGN_TYPE_WINDOW) {
+ rv3d= (RegionView3D *)ar->regiondata;
+ if (found == 1 || found == 3) {
+ if (rv3d->persp == RV3D_CAMOB)
+ rv3d->persp= RV3D_PERSP;
+ }
+ if (found == 2 || found == 3) {
+ if (rv3d->localvd && rv3d->localvd->persp == RV3D_CAMOB)
+ rv3d->localvd->persp= RV3D_PERSP;
+ }
+ }
+ }
+ }
+ }
}
else if(sl->spacetype==SPACE_OUTLINER) {
SpaceOops *so= (SpaceOops *)sl;
Modified: branches/render25/source/blender/editors/armature/armature_intern.h
===================================================================
--- branches/render25/source/blender/editors/armature/armature_intern.h 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/source/blender/editors/armature/armature_intern.h 2010-06-21 09:02:56 UTC (rev 29588)
@@ -130,6 +130,7 @@
void SKETCH_OT_draw_preview(struct wmOperatorType *ot);
void SKETCH_OT_finish_stroke(struct wmOperatorType *ot);
void SKETCH_OT_cancel_stroke(struct wmOperatorType *ot);
+void SKETCH_OT_convert(struct wmOperatorType *ot);
void SKETCH_OT_select(struct wmOperatorType *ot);
/* ******************************************************* */
Modified: branches/render25/source/blender/editors/armature/armature_ops.c
===================================================================
--- branches/render25/source/blender/editors/armature/armature_ops.c 2010-06-21 07:51:40 UTC (rev 29587)
+++ branches/render25/source/blender/editors/armature/armature_ops.c 2010-06-21 09:02:56 UTC (rev 29588)
@@ -96,6 +96,7 @@
WM_operatortype_append(SKETCH_OT_draw_preview);
WM_operatortype_append(SKETCH_OT_finish_stroke);
WM_operatortype_append(SKETCH_OT_cancel_stroke);
+ WM_operatortype_append(SKETCH_OT_convert);
WM_operatortype_append(SKETCH_OT_select);
/* POSE */
@@ -190,14 +191,15 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list