[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29382] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r29361:29381
Campbell Barton
ideasman42 at gmail.com
Thu Jun 10 10:03:39 CEST 2010
Revision: 29382
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29382
Author: campbellbarton
Date: 2010-06-10 10:03:39 +0200 (Thu, 10 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29361:29381
Modified Paths:
--------------
branches/render25/config/linuxcross-config.py
branches/render25/release/scripts/modules/add_object_utils.py
branches/render25/release/scripts/modules/bpy/utils.py
branches/render25/release/scripts/modules/bpy_types.py
branches/render25/release/scripts/op/console_python.py
branches/render25/release/scripts/op/object.py
branches/render25/release/scripts/op/sequencer.py
branches/render25/release/scripts/op/uv.py
branches/render25/release/scripts/op/wm.py
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/properties_object_constraint.py
branches/render25/release/scripts/ui/properties_physics_smoke.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_logic.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/include/ED_object.h
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_intern.h
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/screendump.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_info/info_ops.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/python/intern/bpy.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/render25/config/linuxcross-config.py
===================================================================
--- branches/render25/config/linuxcross-config.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/config/linuxcross-config.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -153,7 +153,7 @@
BF_OPENGL_LIB = 'opengl32 glu32'
BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
-WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
BF_OPENMP = LIBDIR + '/gcc/gomp'
BF_OPENMP_INC = '${BF_OPENMP}/include'
BF_OPENMP_LIBPATH = '${BF_OPENMP}/lib'
Modified: branches/render25/release/scripts/modules/add_object_utils.py
===================================================================
--- branches/render25/release/scripts/modules/add_object_utils.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/modules/add_object_utils.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -21,6 +21,7 @@
import bpy
import mathutils
+
def add_object_align_init(context, operator):
if operator and operator.properties.is_property_set("location") and operator.properties.is_property_set("rotation"):
Modified: branches/render25/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/render25/release/scripts/modules/bpy/utils.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/modules/bpy/utils.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -144,7 +144,7 @@
_loaded.append(mod)
if reload_scripts:
-
+
# TODO, this is broken but should work, needs looking into
'''
# reload modules that may not be directly included
@@ -369,7 +369,7 @@
time = time % 60.0
seconds = int(time)
- frames= int(round(math.floor(((time - seconds) * fps))))
+ frames = int(round(math.floor(((time - seconds) * fps))))
return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames)
Modified: branches/render25/release/scripts/modules/bpy_types.py
===================================================================
--- branches/render25/release/scripts/modules/bpy_types.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/modules/bpy_types.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -29,15 +29,36 @@
__slots__ = ()
def copy(self):
+ from types import BuiltinMethodType
new_context = {}
- generic_keys = StructRNA.__dict__.keys()
- for item in dir(self):
- if item not in generic_keys:
- new_context[item] = getattr(self, item)
+ generic_attrs = list(StructRNA.__dict__.keys()) + ["bl_rna", "rna_type", "copy"]
+ for attr in dir(self):
+ if not (attr.startswith("_") or attr in generic_attrs):
+ value = getattr(self, attr)
+ if type(value) != BuiltinMethodType:
+ new_context[attr] = value
return new_context
+class Library(bpy_types.ID):
+ __slots__ = ()
+
+ @property
+ def users_id(self):
+ """ID datablocks which use this library"""
+ import bpy
+
+ # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE, we could make this an attribute in rna.
+ attr_links = "actions", "armatures", "brushes", "cameras", \
+ "curves", "gpencil", "groups", "images", \
+ "lamps", "lattices", "materials", "metaballs", \
+ "meshes", "node_groups", "objects", "scenes", \
+ "sounds", "textures", "texts", "fonts", "worlds"
+
+ return tuple(id_block for attr in attr_links for id_block in getattr(bpy.data, attr) if id_block.library == self)
+
+
class Texture(bpy_types.ID):
__slots__ = ()
@@ -415,7 +436,7 @@
closed loops have matching start and end values.
"""
line_polys = []
-
+
# Get edges not used by a face
if edges is None:
edges = self.edges
@@ -423,10 +444,10 @@
if not hasattr(edges, "pop"):
edges = edges[:]
- edge_dict= dict((ed.key, ed) for ed in self.edges if ed.selected)
-
+ edge_dict = dict((ed.key, ed) for ed in self.edges if ed.selected)
+
while edges:
- current_edge= edges.pop()
+ current_edge = edges.pop()
vert_end, vert_start = current_edge.verts[:]
line_poly = [vert_start, vert_end]
@@ -444,7 +465,7 @@
vert_end = line_poly[-1]
ok = 1
del edges[i]
- #break
+ # break
elif v2 == vert_end:
line_poly.append(v1)
vert_end = line_poly[-1]
@@ -456,7 +477,7 @@
vert_start = line_poly[0]
ok = 1
del edges[i]
- #break
+ # break
elif v2 == vert_start:
line_poly.insert(0, v1)
vert_start = line_poly[0]
@@ -468,7 +489,6 @@
return line_polys
-
class MeshEdge(StructRNA):
__slots__ = ()
Modified: branches/render25/release/scripts/op/console_python.py
===================================================================
--- branches/render25/release/scripts/op/console_python.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/op/console_python.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -121,8 +121,8 @@
# unlikely, but this can happen with unicode errors for example.
import traceback
stderr.write(traceback.format_exc())
-
+
stdout.seek(0)
stderr.seek(0)
@@ -180,7 +180,7 @@
# note: unlikely stdin would be used for autocomp. but its possible.
stdin_backup = sys.stdin
sys.stdin = None
-
+
scrollback = ""
scrollback_error = ""
Modified: branches/render25/release/scripts/op/object.py
===================================================================
--- branches/render25/release/scripts/op/object.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/op/object.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -515,9 +515,9 @@
def execute(self, context):
act_type = context.object.type
-
+
for obj in context.visible_objects:
-
+
if obj.selected:
obj.restrict_render = False
else:
Modified: branches/render25/release/scripts/op/sequencer.py
===================================================================
--- branches/render25/release/scripts/op/sequencer.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/op/sequencer.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -138,6 +138,7 @@
register(SequencerCutMulticam)
register(SequencerDeinterlaceSelectedMovies)
+
def unregister():
unregister = bpy.types.unregister
@@ -145,7 +146,6 @@
unregister(SequencerCutMulticam)
unregister(SequencerDeinterlaceSelectedMovies)
-
if __name__ == "__main__":
register()
Modified: branches/render25/release/scripts/op/uv.py
===================================================================
--- branches/render25/release/scripts/op/uv.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/op/uv.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -178,7 +178,7 @@
fw('stroke\n')
fw('} def\n')
fw('newpath\n')
-
+
firstline = True
for i, uvs in self._face_uv_iter(context):
for j, uv in enumerate(uvs):
Modified: branches/render25/release/scripts/op/wm.py
===================================================================
--- branches/render25/release/scripts/op/wm.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/op/wm.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8-80 compliant>
+# <pep8 compliant>
import bpy
Modified: branches/render25/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_modifier.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/ui/properties_data_modifier.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -454,12 +454,12 @@
col = layout.column()
row = col.row()
if md.external:
- row.operator("object.multires_pack_external", text="Pack External")
+ row.operator("object.multires_external_pack", text="Pack External")
row.label()
row = col.row()
row.prop(md, "filepath", text="")
else:
- row.operator("object.multires_save_external", text="Save External...")
+ row.operator("object.multires_external_save", text="Save External...")
row.label()
def PARTICLE_INSTANCE(self, layout, ob, md, wide_ui):
Modified: branches/render25/release/scripts/ui/properties_object_constraint.py
===================================================================
--- branches/render25/release/scripts/ui/properties_object_constraint.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/ui/properties_object_constraint.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -739,7 +739,7 @@
else:
col = layout.column()
col.prop(con, "use_relative_position")
- if con.use_relative_position:
+ if con.use_relative_position:
col.prop(con, "offset", text="Relative Pivot Point")
else:
col.prop(con, "offset", text="Absolute Pivot Point")
@@ -747,6 +747,7 @@
col = layout.column()
col.prop(con, "enabled_rotation_range", text="Pivot When")
+
class OBJECT_PT_constraints(ConstraintButtonsPanel):
bl_label = "Object Constraints"
bl_context = "constraint"
Modified: branches/render25/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_smoke.py 2010-06-10 07:58:29 UTC (rev 29381)
+++ branches/render25/release/scripts/ui/properties_physics_smoke.py 2010-06-10 08:03:39 UTC (rev 29382)
@@ -183,7 +183,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list