[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39333] branches/soc-2011-tomato: Merging r39312 through r39329 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Fri Aug 12 16:39:04 CEST 2011
Revision: 39333
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39333
Author: nazgul
Date: 2011-08-12 14:39:04 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Merging r39312 through r39329 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39329
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-39311
+ /trunk/blender:36831-39329
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -44,14 +44,18 @@
ops = ops.ops_fake_module
-def _main():
- import sys as _sys
+def main():
+ import sys
# Possibly temp. addons path
from os.path import join, dirname, normpath
- _sys.path.append(normpath(join(dirname(__file__),
+ sys.path.append(normpath(join(dirname(__file__),
"..", "..", "addons", "modules")))
+ # fake module to allow:
+ # from bpy.types import Panel
+ sys.modules["bpy.types"] = types
+
# if "-d" in sys.argv: # Enable this to measure startup speed
if 0:
import cProfile
@@ -65,6 +69,6 @@
utils.load_scripts()
-_main()
+main()
-del _main
+del main
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -18,6 +18,7 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
import mathutils
@@ -81,7 +82,7 @@
)
-class AddTorus(bpy.types.Operator):
+class AddTorus(Operator):
'''Add a torus mesh'''
bl_idname = "mesh.primitive_torus_add"
bl_label = "Add Torus"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/animsys_update.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/animsys_update.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/animsys_update.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -686,9 +686,10 @@
import bpy
+from bpy.types import Operator
-class UpdateAnimData(bpy.types.Operator):
+class UpdateAnimData(Operator):
"""Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"""
bl_idname = "anim.update_data_paths"
bl_label = "Update Animation Data"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -19,10 +19,11 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
from bpy.props import StringProperty
-class EditExternally(bpy.types.Operator):
+class EditExternally(Operator):
'''Edit image in an external application'''
bl_idname = "image.external_edit"
bl_label = "Image Edit Externally"
@@ -106,7 +107,7 @@
return {'FINISHED'}
-class SaveDirty(bpy.types.Operator):
+class SaveDirty(Operator):
"""Save all modified textures"""
bl_idname = "image.save_dirty"
bl_label = "Save Dirty"
@@ -129,7 +130,7 @@
return {'FINISHED'}
-class ProjectEdit(bpy.types.Operator):
+class ProjectEdit(Operator):
"""Edit a snapshot of the viewport in an external image editor"""
bl_idname = "image.project_edit"
bl_label = "Project Edit"
@@ -196,7 +197,7 @@
return {'FINISHED'}
-class ProjectApply(bpy.types.Operator):
+class ProjectApply(Operator):
"""Project edited image back onto the object"""
bl_idname = "image.project_apply"
bl_label = "Project Apply"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -19,11 +19,12 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
from bpy.props import EnumProperty
-class MeshSelectInteriorFaces(bpy.types.Operator):
+class MeshSelectInteriorFaces(Operator):
'''Select faces where all edges have more then 2 face users.'''
bl_idname = "mesh.faces_select_interior"
@@ -67,7 +68,7 @@
return {'FINISHED'}
-class MeshMirrorUV(bpy.types.Operator):
+class MeshMirrorUV(Operator):
'''Copy mirror UV coordinates on the X axis based on a mirrored mesh'''
bl_idname = "mesh.faces_mirror_uv"
bl_label = "Copy Mirrored UV coords"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -19,6 +19,7 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
def pose_frame_info(obj):
@@ -191,7 +192,7 @@
from bpy.props import IntProperty, BoolProperty, EnumProperty
-class BakeAction(bpy.types.Operator):
+class BakeAction(Operator):
'''Bake animation to an Action'''
bl_idname = "nla.bake"
bl_label = "Bake Action"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -19,10 +19,11 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty
-class SelectPattern(bpy.types.Operator):
+class SelectPattern(Operator):
'''Select object matching a naming pattern'''
bl_idname = "object.select_pattern"
bl_label = "Select Pattern"
@@ -99,7 +100,7 @@
row.prop(self, "extend")
-class SelectCamera(bpy.types.Operator):
+class SelectCamera(Operator):
'''Select object matching a naming pattern'''
bl_idname = "object.select_camera"
bl_label = "Select Camera"
@@ -120,7 +121,7 @@
return {'FINISHED'}
-class SelectHierarchy(bpy.types.Operator):
+class SelectHierarchy(Operator):
'''Select object relative to the active objects position''' \
'''in the hierarchy'''
bl_idname = "object.select_hierarchy"
@@ -187,7 +188,7 @@
return {'CANCELLED'}
-class SubdivisionSet(bpy.types.Operator):
+class SubdivisionSet(Operator):
'''Sets a Subdivision Surface Level (1-5)'''
bl_idname = "object.subdivision_set"
@@ -263,7 +264,7 @@
return {'FINISHED'}
-class ShapeTransfer(bpy.types.Operator):
+class ShapeTransfer(Operator):
'''Copy another selected objects active shape to this one by ''' \
'''applying the relative offsets'''
@@ -507,7 +508,7 @@
return self._main(ob_act, objects, self.mode, self.use_clamp)
-class JoinUVs(bpy.types.Operator):
+class JoinUVs(Operator):
'''Copy UV Layout to objects with matching geometry'''
bl_idname = "object.join_uvs"
bl_label = "Join as UVs"
@@ -575,7 +576,7 @@
return {'FINISHED'}
-class MakeDupliFace(bpy.types.Operator):
+class MakeDupliFace(Operator):
'''Make linked objects into dupli-faces'''
bl_idname = "object.make_dupli_face"
bl_label = "Make Dupli-Face"
@@ -649,7 +650,7 @@
return {'FINISHED'}
-class IsolateTypeRender(bpy.types.Operator):
+class IsolateTypeRender(Operator):
'''Hide unselected render objects of same type as active ''' \
'''by setting the hide render flag'''
bl_idname = "object.isolate_type_render"
@@ -670,7 +671,7 @@
return {'FINISHED'}
-class ClearAllRestrictRender(bpy.types.Operator):
+class ClearAllRestrictRender(Operator):
'''Reveal all render objects by setting the hide render flag'''
bl_idname = "object.hide_render_clear_all"
bl_label = "Clear All Restrict Render"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_align.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -19,6 +19,7 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
from mathutils import Vector
@@ -339,7 +340,7 @@
from bpy.props import EnumProperty, BoolProperty
-class AlignObjects(bpy.types.Operator):
+class AlignObjects(Operator):
'''Align Objects'''
bl_idname = "object.align"
bl_label = "Align Objects"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py 2011-08-12 13:43:21 UTC (rev 39332)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py 2011-08-12 14:39:04 UTC (rev 39333)
@@ -20,6 +20,7 @@
from mathutils import Vector
import bpy
+from bpy.types import Operator
from bpy.props import (BoolProperty,
EnumProperty,
IntProperty,
@@ -45,7 +46,7 @@
return mat
-class QuickFur(bpy.types.Operator):
+class QuickFur(Operator):
bl_idname = "object.quick_fur"
bl_label = "Quick Fur"
bl_options = {'REGISTER', 'UNDO'}
@@ -104,7 +105,7 @@
return {'FINISHED'}
-class QuickExplode(bpy.types.Operator):
+class QuickExplode(Operator):
bl_idname = "object.quick_explode"
bl_label = "Quick Explode"
bl_options = {'REGISTER', 'UNDO'}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list