[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28774] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 28772.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Fri May 14 23:50:15 CEST 2010 

Revision: 28774
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28774
Author:   kjym3
Date:     2010-05-14 23:50:15 +0200 (Fri, 14 May 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 28772.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28772

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
    branches/soc-2008-mxcurioni/release/scripts/op/nla.py
    branches/soc-2008-mxcurioni/release/scripts/op/presets.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_text.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_smoke.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/collada/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/creator/creator.c

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/layout.html
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/page.html
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/bg.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/favicon.ico
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/jquery.sidebar.js
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/pygments.css
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rnd.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rndbl.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rndbr.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/theme.conf

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/layout.html
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/page.html
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/bg.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/favicon.ico
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/jquery.sidebar.js
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/pygments.css
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rnd.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rndbl.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/static/rndbr.png
    branches/soc-2008-mxcurioni/source/blender/python/doc/blender-org/theme.conf

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-14 21:50:15 UTC (rev 28774)
@@ -62,7 +62,6 @@
 OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
 OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
-OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
 OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 OPTION(WITH_DDS           "Enable DDS Support" ON)
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
@@ -79,17 +78,22 @@
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
 
+IF(APPLE OR WIN32)
+	OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+ENDIF(APPLE OR WIN32)
+
 # Unix defaults to OpenMP On
+# Disable opencollada on non-apple unix because opencollada has no package for debian
 IF(UNIX AND NOT APPLE)
 	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ELSE()
 	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
 ENDIF()
 
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
-
 IF (APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)

Modified: branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -27,7 +27,7 @@
 import os as _os
 import sys as _sys
 
-from _bpy import home_paths
+from _bpy import home_paths, blend_paths
 
 
 def _test_import(module_name, loaded_modules):
@@ -332,3 +332,52 @@
     '''
 
     return (_os.path.join(_presets, subdir), )
+
+
+def smpte_from_seconds(time, fps=None):
+    '''
+    Returns an SMPTE formatted string from the time in seconds: "HH:MM:SS:FF".
+
+    If the fps is not given the current scene is used.
+    '''
+    import math
+
+    if fps is None:
+        fps = _bpy.context.scene.render.fps
+
+    hours = minutes = seconds = frames = 0
+
+    if time < 0:
+        time = -time
+        neg = "-"
+    else:
+        neg = ""
+
+    if time >= 3600.0: # hours
+        hours = int(time / 3600.0)
+        time = time % 3600.0
+    if time >= 60.0: # mins
+        minutes = int(time / 60.0)
+        time = time % 60.0
+
+    seconds = int(time)
+    frames= int(round(math.floor( ((time - seconds) * fps))))
+
+    return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames)
+    
+
+def smpte_from_frame(frame, fps=None, fps_base=None):
+    '''
+    Returns an SMPTE formatted string from the frame: "HH:MM:SS:FF".
+
+    If the fps and fps_base are not given the current scene is used.
+    '''
+
+    if fps is None:
+        fps = _bpy.context.scene.render.fps
+
+    if fps_base is None:
+        fps_base = _bpy.context.scene.render.fps_base
+
+    return smpte_from_seconds((frame * fps_base) / fps, fps)
+    
\ No newline at end of file

Modified: branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -253,7 +253,7 @@
 class WM_OT_properties_remove(bpy.types.Operator):
     '''Internal use (edit a property path)'''
     bl_idname = "wm.properties_remove"
-    bl_label = "Add Property"
+    bl_label = "Remove Property"
 
     path = rna_path
     property = rna_property

Modified: branches/soc-2008-mxcurioni/release/scripts/op/nla.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/nla.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/op/nla.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -130,7 +130,7 @@
 
 
 class BakeAction(bpy.types.Operator):
-    '''Add a torus mesh'''
+    '''Bake animation to an Action'''
     bl_idname = "nla.bake"
     bl_label = "Bake Action"
     bl_options = {'REGISTER', 'UNDO'}

Modified: branches/soc-2008-mxcurioni/release/scripts/op/presets.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/presets.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/op/presets.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -27,8 +27,8 @@
     subclasses must define
      - preset_values
      - preset_subdir '''
-    bl_idname = "render.preset_add"
-    bl_label = "Add Render Preset"
+    bl_idname = "script.add_preset_base"
+    bl_label = "Add a Python Preset"
 
     name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen=64, default="")
 

Modified: branches/soc-2008-mxcurioni/release/scripts/op/wm.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/wm.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/op/wm.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -24,8 +24,7 @@
 
 
 class MESH_OT_delete_edgeloop(bpy.types.Operator):
-    '''Export a single object as a stanford PLY with normals,
-    colours and texture coordinates.'''
+    '''Delete an edge loop by merging the faces on each side to a single face loop'''
     bl_idname = "mesh.delete_edgeloop"
     bl_label = "Delete Edge Loop"
 

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -269,10 +269,9 @@
         return psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.hair_dynamics)
 
     def draw(self, context):
-
         psys = context.particle_system
 
-        point_cache_ui(self, context, psys.point_cache, particle_panel_enabled(context, psys), not psys.hair_dynamics, 0)
+        point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.hair_dynamics else 'PSYS')
 
 
 class PARTICLE_PT_velocity(ParticleButtonsPanel):

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -142,7 +142,7 @@
 
     def draw(self, context):
         md = context.cloth
-        point_cache_ui(self, context, md.point_cache, cloth_panel_enabled(md), 0, 0)
+        point_cache_ui(self, context, md.point_cache, cloth_panel_enabled(md), 'CLOTH')
 
 
 class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -22,7 +22,8 @@
 
 import bpy
 
-def point_cache_ui(self, context, cache, enabled, particles, smoke):
+#cachetype can be 'PSYS' 'HAIR' 'SMOKE' etc
+def point_cache_ui(self, context, cache, enabled, cachetype):
     layout = self.layout
 
     wide_ui = context.region.width > narrowui
@@ -35,7 +36,7 @@
     col.operator("ptcache.remove", icon='ZOOMOUT', text="")
 
     row = layout.row()
-    if particles:
+    if cachetype in {'PSYS', 'HAIR'}:
         row.prop(cache, "external")
 
     if cache.external:
@@ -53,17 +54,17 @@
         split = layout.split()
         col = split.column(align=True)
 
-        if not particles:
+        if cachetype != 'PSYS':
             col.enabled = enabled
             col.prop(cache, "frame_start")
             col.prop(cache, "frame_end")
-        if not smoke:
+        if cachetype != 'SMOKE':
             col.prop(cache, "step")
 
         if wide_ui:
             col = split.column()
 
-        if not smoke:
+        if cachetype != 'SMOKE':
             sub = col.column()
             sub.enabled = enabled
             sub.prop(cache, "quick_cache")
@@ -102,7 +103,6 @@
         col.operator("ptcache.free_bake_all", text="Free All Bakes")
         col.operator("ptcache.bake_all", text="Update All To Frame").bake = False
 
-
 def effector_weights_ui(self, context, weights):
     layout = self.layout
 

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py	2010-05-14 21:29:13 UTC (rev 28773)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py	2010-05-14 21:50:15 UTC (rev 28774)
@@ -166,7 +166,7 @@
         md = context.smoke.domain_settings
         cache = md.point_cache_low
 
-        point_cache_ui(self, context, cache, (cache.baked is False), 0, 1)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list