[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30955] branches/soc-2010-nexyon: svn merge -r 30913:30953 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Joerg Mueller
nexyon at gmail.com
Mon Aug 2 01:19:31 CEST 2010
Revision: 30955
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30955
Author: nexyon
Date: 2010-08-02 01:19:30 +0200 (Mon, 02 Aug 2010)
Log Message:
-----------
svn merge -r 30913:30953 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-nexyon/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py
branches/soc-2010-nexyon/release/scripts/io/netrender/ui.py
branches/soc-2010-nexyon/release/scripts/op/object.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d.py
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_library.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_material.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_mesh.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-nexyon/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/deform.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/font.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/library.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/material.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/scene.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nexyon/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-nexyon/source/blender/editors/animation/drivers.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframing.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature.c
branches/soc-2010-nexyon/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nexyon/source/blender/editors/curve/editcurve.c
branches/soc-2010-nexyon/source/blender/editors/include/ED_armature.h
branches/soc-2010-nexyon/source/blender/editors/include/ED_object.h
branches/soc-2010-nexyon/source/blender/editors/interface/interface.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nexyon/source/blender/editors/interface/resources.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh.c
branches/soc-2010-nexyon/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nexyon/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nexyon/source/blender/editors/object/object_add.c
branches/soc-2010-nexyon/source/blender/editors/object/object_bake.c
branches/soc-2010-nexyon/source/blender/editors/object/object_constraint.c
branches/soc-2010-nexyon/source/blender/editors/object/object_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_group.c
branches/soc-2010-nexyon/source/blender/editors/object/object_hook.c
branches/soc-2010-nexyon/source/blender/editors/object/object_modifier.c
branches/soc-2010-nexyon/source/blender/editors/object/object_ops.c
branches/soc-2010-nexyon/source/blender/editors/object/object_relations.c
branches/soc-2010-nexyon/source/blender/editors/object/object_transform.c
branches/soc-2010-nexyon/source/blender/editors/physics/particle_boids.c
branches/soc-2010-nexyon/source/blender/editors/physics/particle_object.c
branches/soc-2010-nexyon/source/blender/editors/physics/physics_ops.c
branches/soc-2010-nexyon/source/blender/editors/render/render_internal.c
branches/soc-2010-nexyon/source/blender/editors/render/render_opengl.c
branches/soc-2010-nexyon/source/blender/editors/render/render_preview.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nexyon/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nexyon/source/blender/editors/util/ed_util.c
branches/soc-2010-nexyon/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-nexyon/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-nexyon/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nexyon/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-nexyon/source/blender/render/intern/include/render_types.h
branches/soc-2010-nexyon/source/blender/render/intern/include/texture.h
branches/soc-2010-nexyon/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nexyon/source/blender/render/intern/source/envmap.c
branches/soc-2010-nexyon/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nexyon/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-nexyon/source/blender/render/intern/source/sss.c
branches/soc-2010-nexyon/source/blender/render/intern/source/texture.c
branches/soc-2010-nexyon/source/blender/render/intern/source/voxeldata.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nexyon/source/creator/creator.c
Property Changed:
----------------
branches/soc-2010-nexyon/release/scripts/io/netrender/repath.py
Modified: branches/soc-2010-nexyon/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2010-nexyon/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-08-01 22:54:39 UTC (rev 30954)
+++ branches/soc-2010-nexyon/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-08-01 23:19:30 UTC (rev 30955)
@@ -1299,6 +1299,11 @@
NSArray *windowsList = [NSApp orderedWindows];
if ([windowsList count]) {
[[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil];
+ //Handle the modifiers keyes changed state issue
+ //as recovering from the quit dialog is like application
+ //gaining focus back.
+ //Main issue fixed is Cmd modifier not being cleared
+ handleApplicationBecomeActiveEvent();
}
}
Modified: branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py 2010-08-01 22:54:39 UTC (rev 30954)
+++ branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py 2010-08-01 23:19:30 UTC (rev 30955)
@@ -18,17 +18,32 @@
# This directory is a Python package.
-from netrender import model
-from netrender import operators
-from netrender import client
-from netrender import slave
-from netrender import master
-from netrender import master_html
-from netrender import utils
-from netrender import balancing
-from netrender import ui
-from netrender import repath
+# To support reload properly, try to access a package var, if it's there, reload everything
+try:
+ init_data
+ reload(model)
+ reload(operators)
+ reload(client)
+ reload(slave)
+ reload(master)
+ reload(master_html)
+ reload(utils)
+ reload(balancing)
+ reload(ui)
+ reload(repath)
+except:
+ from netrender import model
+ from netrender import operators
+ from netrender import client
+ from netrender import slave
+ from netrender import master
+ from netrender import master_html
+ from netrender import utils
+ from netrender import balancing
+ from netrender import ui
+ from netrender import repath
+
jobs = []
slaves = []
blacklist = []
@@ -38,14 +53,10 @@
init_address = True
def register():
- pass # TODO
+ ui.addProperties()
+
def unregister():
import bpy
-
bpy.types.Scene.RemoveProperty("network_render")
- bpy.types.unregister(ui.NetRenderJob)
- bpy.types.unregister(ui.NetRenderSettings)
- bpy.types.unregister(ui.NetRenderSlave)
-
Property changes on: branches/soc-2010-nexyon/release/scripts/io/netrender/repath.py
___________________________________________________________________
Name: svn:executable
- *
Modified: branches/soc-2010-nexyon/release/scripts/io/netrender/ui.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/netrender/ui.py 2010-08-01 22:54:39 UTC (rev 30954)
+++ branches/soc-2010-nexyon/release/scripts/io/netrender/ui.py 2010-08-01 23:19:30 UTC (rev 30955)
@@ -337,138 +337,139 @@
class NetRenderJob(bpy.types.IDPropertyGroup):
pass
-bpy.types.Scene.PointerProperty(attr="network_render", type=NetRenderSettings, name="Network Render", description="Network Render Settings")
-
-NetRenderSettings.StringProperty( attr="server_address",
- name="Server address",
- description="IP or name of the master render server",
- maxlen = 128,
- default = "[default]")
-
-NetRenderSettings.IntProperty( attr="server_port",
- name="Server port",
- description="port of the master render server",
- default = 8000,
- min=1,
- max=65535)
-
-NetRenderSettings.BoolProperty( attr="master_broadcast",
- name="Broadcast",
- description="broadcast master server address on local network",
- default = True)
-
-NetRenderSettings.BoolProperty( attr="slave_clear",
- name="Clear on exit",
- description="delete downloaded files on exit",
- default = True)
-
-NetRenderSettings.BoolProperty( attr="slave_thumb",
- name="Generate thumbnails",
- description="Generate thumbnails on slaves instead of master",
- default = False)
-
-NetRenderSettings.BoolProperty( attr="slave_outputlog",
- name="Output render log on console",
- description="Output render text log to console as well as sending it to the master",
- default = True)
-
-NetRenderSettings.BoolProperty( attr="master_clear",
- name="Clear on exit",
- description="delete saved files on exit",
- default = False)
-
-default_path = os.environ.get("TEMP")
-
-if not default_path:
- if os.name == 'nt':
- default_path = "c:/tmp/"
- else:
- default_path = "/tmp/"
-elif not default_path.endswith(os.sep):
- default_path += os.sep
-
-NetRenderSettings.StringProperty( attr="path",
- name="Path",
- description="Path for temporary files",
- maxlen = 128,
- default = default_path,
- subtype='FILE_PATH')
-
-NetRenderSettings.StringProperty( attr="job_name",
- name="Job name",
- description="Name of the job",
- maxlen = 128,
- default = "[default]")
-
-NetRenderSettings.StringProperty( attr="job_category",
- name="Job category",
- description="Category of the job",
- maxlen = 128,
- default = "")
-
-NetRenderSettings.IntProperty( attr="chunks",
- name="Chunks",
- description="Number of frame to dispatch to each slave in one chunk",
- default = 5,
- min=1,
- max=65535)
-
-NetRenderSettings.IntProperty( attr="priority",
- name="Priority",
- description="Priority of the job",
- default = 1,
- min=1,
- max=10)
-
-NetRenderSettings.StringProperty( attr="job_id",
- name="Network job id",
- description="id of the last sent render job",
- maxlen = 64,
- default = "")
-
-NetRenderSettings.IntProperty( attr="active_slave_index",
- name="Index of the active slave",
- description="",
- default = -1,
- min= -1,
- max=65535)
-
-NetRenderSettings.IntProperty( attr="active_blacklisted_slave_index",
- name="Index of the active slave",
- description="",
- default = -1,
- min= -1,
- max=65535)
-
-NetRenderSettings.IntProperty( attr="active_job_index",
- name="Index of the active job",
- description="",
- default = -1,
- min= -1,
- max=65535)
-
-NetRenderSettings.EnumProperty(attr="mode",
- items=(
- ("RENDER_CLIENT", "Client", "Act as render client"),
- ("RENDER_MASTER", "Master", "Act as render master"),
- ("RENDER_SLAVE", "Slave", "Act as render slave"),
- ),
- name="Network mode",
- description="Mode of operation of this instance",
- default="RENDER_CLIENT")
-
-NetRenderSettings.CollectionProperty(attr="slaves", type=NetRenderSlave, name="Slaves", description="")
-NetRenderSettings.CollectionProperty(attr="slaves_blacklist", type=NetRenderSlave, name="Slaves Blacklist", description="")
-NetRenderSettings.CollectionProperty(attr="jobs", type=NetRenderJob, name="Job List", description="")
-
-NetRenderSlave.StringProperty( attr="name",
- name="Name of the slave",
- description="",
- maxlen = 64,
- default = "")
-
-NetRenderJob.StringProperty( attr="name",
- name="Name of the job",
- description="",
- maxlen = 128,
- default = "")
+def addProperties():
+ bpy.types.Scene.PointerProperty(attr="network_render", type=NetRenderSettings, name="Network Render", description="Network Render Settings")
+
+ NetRenderSettings.StringProperty( attr="server_address",
+ name="Server address",
+ description="IP or name of the master render server",
+ maxlen = 128,
+ default = "[default]")
+
+ NetRenderSettings.IntProperty( attr="server_port",
+ name="Server port",
+ description="port of the master render server",
+ default = 8000,
+ min=1,
+ max=65535)
+
+ NetRenderSettings.BoolProperty( attr="master_broadcast",
+ name="Broadcast",
+ description="broadcast master server address on local network",
+ default = True)
+
+ NetRenderSettings.BoolProperty( attr="slave_clear",
+ name="Clear on exit",
+ description="delete downloaded files on exit",
+ default = True)
+
+ NetRenderSettings.BoolProperty( attr="slave_thumb",
+ name="Generate thumbnails",
+ description="Generate thumbnails on slaves instead of master",
+ default = False)
+
+ NetRenderSettings.BoolProperty( attr="slave_outputlog",
+ name="Output render log on console",
+ description="Output render text log to console as well as sending it to the master",
+ default = True)
+
+ NetRenderSettings.BoolProperty( attr="master_clear",
+ name="Clear on exit",
+ description="delete saved files on exit",
+ default = False)
+
+ default_path = os.environ.get("TEMP")
+
+ if not default_path:
+ if os.name == 'nt':
+ default_path = "c:/tmp/"
+ else:
+ default_path = "/tmp/"
+ elif not default_path.endswith(os.sep):
+ default_path += os.sep
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list