[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22407] branches/soc-2009-yukishiro: merge till 22406
Jingyuan Huang
jingyuan.huang at gmail.com
Wed Aug 12 17:03:49 CEST 2009
Revision: 22407
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22407
Author: yukishiro
Date: 2009-08-12 17:03:48 +0200 (Wed, 12 Aug 2009)
Log Message:
-----------
merge till 22406
Modified Paths:
--------------
branches/soc-2009-yukishiro/CMakeLists.txt
branches/soc-2009-yukishiro/intern/audaspace/SRC/Makefile
branches/soc-2009-yukishiro/intern/audaspace/intern/Makefile
branches/soc-2009-yukishiro/release/ui/bpy_ops.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/source/Makefile
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_cloth.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_softbody.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cloth.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh.c
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_meta.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/gameengine/Converter/Makefile
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/Makefile
branches/soc-2009-yukishiro/source/gameengine/Ketsji/Makefile
branches/soc-2009-yukishiro/source/gameengine/Makefile
Added Paths:
-----------
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_unit.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/unit.c
Property Changed:
----------------
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_channels_defines.c
Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/CMakeLists.txt 2009-08-12 15:03:48 UTC (rev 22407)
@@ -423,7 +423,7 @@
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- SET(LIBSAMPLERATE_LIB libsamplerate)
+ SET(LIBSAMPLERATE_LIB samplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
SET(LLIBS stdc++ lapack blas SystemStubs)
Modified: branches/soc-2009-yukishiro/intern/audaspace/SRC/Makefile
===================================================================
--- branches/soc-2009-yukishiro/intern/audaspace/SRC/Makefile 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/intern/audaspace/SRC/Makefile 2009-08-12 15:03:48 UTC (rev 22407)
@@ -35,6 +35,7 @@
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
CPPFLAGS += -I../ffmpeg
CPPFLAGS += -I../FX
CPPFLAGS += -I../SDL
Modified: branches/soc-2009-yukishiro/intern/audaspace/intern/Makefile
===================================================================
--- branches/soc-2009-yukishiro/intern/audaspace/intern/Makefile 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/intern/audaspace/intern/Makefile 2009-08-12 15:03:48 UTC (rev 22407)
@@ -35,6 +35,7 @@
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+CPPFLAGS += -I$(LCGDIR)/samplerate/include/
CPPFLAGS += -I../ffmpeg
CPPFLAGS += -I../FX
CPPFLAGS += -I../SDL
Modified: branches/soc-2009-yukishiro/release/ui/bpy_ops.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/bpy_ops.py 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/release/ui/bpy_ops.py 2009-08-12 15:03:48 UTC (rev 22407)
@@ -111,48 +111,3 @@
import bpy
bpy.ops = bpy_ops()
-
-
-
-
-# A bit out of place but add button conversion code here
-module_type = type(__builtins__)
-import types
-mod = types.ModuleType('button_convert')
-
-import sys
-sys.modules['button_convert'] = mod
-
-def convert(expr):
-
- def replace(string, unit, scaler):
- # in need of regex
- change = True
- while change:
- change = False
- i = string.find(unit)
- if i != -1:
- if i>0 and not string[i-1].isalpha():
- i_end = i+len(unit)
- if i_end+1 >= len(string) or (not string[i_end+1].isalpha()):
- string = string.replace(unit, scaler)
- change = True
- # print(string)
- return string
-
- #imperial
- expr = replace(expr, 'mi', '*1609.344')
- expr = replace(expr, 'yd', '*0.9144')
- expr = replace(expr, 'ft', '*0.3048')
- expr = replace(expr, 'in', '*0.0254')
-
- # metric
- expr = replace(expr, 'km', '*1000')
- expr = replace(expr, 'm', '')
- expr = replace(expr, 'cm', '*0.01')
- expr = replace(expr, 'mm', '*0.001')
-
- return expr
-
-mod.convert = convert
-
Modified: branches/soc-2009-yukishiro/release/ui/buttons_particle.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_particle.py 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/release/ui/buttons_particle.py 2009-08-12 15:03:48 UTC (rev 22407)
@@ -151,8 +151,15 @@
psys = context.particle_system
part = psys.settings
cache = psys.point_cache
+ layout.set_context_pointer("PointCache", cache)
row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+
+ row = layout.row()
row.itemL(text="File Name:")
row.itemR(cache, "external")
@@ -166,37 +173,38 @@
layout.itemL(text=cache.info)
- split = layout.split()
+ #split = layout.split()
- col = split.column(align=True)
- col.itemR(part, "start")
- col.itemR(part, "end")
+ #col = split.column(align=True)
+ #col.itemR(part, "start")
+ #col.itemR(part, "end")
- col = split.column(align=True)
- col.itemR(part, "lifetime")
- col.itemR(part, "random_lifetime", slider=True)
+ #col = split.column(align=True)
+ #col.itemR(part, "lifetime")
+ #col.itemR(part, "random_lifetime", slider=True)
else:
layout.itemR(cache, "name", text="")
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_particle_system", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_particle_system", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
subrow = row.row()
subrow.enabled = (cache.frames_skipped or cache.outdated) and particle_panel_enabled(psys)
- subrow.itemO("ptcache.cache_particle_system", text="Calculate to Current Frame")
+ subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
row.enabled = particle_panel_enabled(psys)
- row.itemO("ptcache.bake_from_particles_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
- row.enabled = particle_panel_enabled(psys)
- row.itemR(cache, "quick_cache")
+ subrow = row.row()
+ subrow.enabled = particle_panel_enabled(psys)
+ subrow.itemR(cache, "quick_cache")
row.itemR(cache, "disk_cache")
layout.itemL(text=cache.info)
@@ -206,7 +214,7 @@
row = layout.row()
row.item_booleanO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
# for particles these are figured out automatically
#row.itemR(cache, "start_frame")
Modified: branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py 2009-08-12 15:03:48 UTC (rev 22407)
@@ -85,8 +85,15 @@
layout = self.layout
cache = context.cloth.point_cache
+ layout.set_context_pointer("PointCache", cache)
row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+
+ row = layout.row()
row.itemR(cache, "name")
row = layout.row()
@@ -96,17 +103,17 @@
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_cloth", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_cloth", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
subrow = row.row()
subrow.enabled = cache.frames_skipped or cache.outdated
- subrow.itemO("ptcache.cache_cloth", text="Calculate to Current Frame")
+ subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
#row.enabled = particle_panel_enabled(psys)
- row.itemO("ptcache.bake_from_cloth_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
@@ -121,7 +128,7 @@
row = layout.row()
row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
__label__ = "Cloth Collision"
Modified: branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py 2009-08-12 14:39:57 UTC (rev 22406)
+++ branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py 2009-08-12 15:03:48 UTC (rev 22407)
@@ -63,8 +63,15 @@
layout = self.layout
cache = context.soft_body.point_cache
+ layout.set_context_pointer("PointCache", cache)
row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
+
+ row = layout.row()
row.itemR(cache, "name")
row = layout.row()
@@ -74,16 +81,16 @@
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_softbody", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_softbody", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
sub = row.row()
sub.enabled = cache.frames_skipped or cache.outdated
- sub.itemO("ptcache.cache_softbody", text="Calculate to Current Frame")
+ sub.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
- row.itemO("ptcache.bake_from_softbody_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
@@ -97,7 +104,7 @@
row = layout.row()
row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
__label__ = "Soft Body Goal"
Modified: branches/soc-2009-yukishiro/release/ui/space_info.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_info.py 2009-08-12 14:39:57 UTC (rev 22406)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list