Revision: 21373
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21373
Author: jaguarandi
Date: 2009-07-05 17:20:19 +0200 (Sun, 05 Jul 2009)
Log Message:
-----------
svn merge -r 21301:21372
https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/soc-2009-jaguarandi/CMakeLists.txt
branches/soc-2009-jaguarandi/release/ui/buttons_data_lattice.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py
branches/soc-2009-jaguarandi/release/ui/buttons_particle.py
branches/soc-2009-jaguarandi/release/ui/buttons_physic_cloth.py
branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_effect.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_modifier.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_screen.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/context.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/effect.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/lattice.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/screen.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2009-jaguarandi/source/blender/editors/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_markers.c
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_fluidsim.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_markers.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_object.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_screen.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_view2d.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_layout.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_panel.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_templates.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/view2d.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editkey.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editlattice.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/object/object_modifier.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_fluidsim.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/area.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-jaguarandi/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_access.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_interface.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.c
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/pipeline.c
Added Paths:
-----------
branches/soc-2009-jaguarandi/release/ui/buttons_physics_field.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_fluid.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_softbody.py
branches/soc-2009-jaguarandi/release/ui/space_view3d_toolbar.py
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_physics.h
Removed Paths:
-------------
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_pointcache.h
Modified: branches/soc-2009-jaguarandi/CMakeLists.txt
===================================================================
--- branches/soc-2009-jaguarandi/CMakeLists.txt 2009-07-05 12:36:20 UTC (rev
21372)
+++ branches/soc-2009-jaguarandi/CMakeLists.txt 2009-07-05 15:20:19 UTC (rev
21373)
@@ -87,7 +87,7 @@
#-----------------------------------------------------------------------------
#Platform specifics
-IF(UNIX)
+IF(UNIX AND NOT APPLE)
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
@@ -177,7 +177,7 @@
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align
-Wnested-externs -Wdeclaration-after-statement")
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} )
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
Modified: branches/soc-2009-jaguarandi/release/ui/buttons_data_lattice.py
===================================================================
--- branches/soc-2009-jaguarandi/release/ui/buttons_data_lattice.py
2009-07-05 12:36:20 UTC (rev 21372)
+++ branches/soc-2009-jaguarandi/release/ui/buttons_data_lattice.py
2009-07-05 15:20:19 UTC (rev 21373)
@@ -48,7 +48,7 @@
row.itemR(lat, "interpolation_type_w", expand=True)
row = layout.row()
+ row.itemO("LATTICE_OT_make_regular")
row.itemR(lat, "outside")
- row.itemR(lat, "shape_keys")
bpy.types.register(DATA_PT_lattice)
Modified: branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
2009-07-05 12:36:20 UTC (rev 21372)
+++ branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
2009-07-05 15:20:19 UTC (rev 21373)
@@ -131,17 +131,45 @@
def draw(self, context):
layout = self.layout
ob = context.object
+ key = ob.data.shape_keys
+ kb = ob.active_shape_key
row = layout.row()
+ row.template_list(key, "keys", ob, "active_shape_key_index")
- key = ob.data.shape_keys
+ col = row.column()
- row.template_list(key, "keys", ob, "active_shape_key_index")
+ subcol = col.column(align=True)
+ subcol.itemO("OBJECT_OT_shape_key_add", icon="ICON_ZOOMIN",
text="")
+ subcol.itemO("OBJECT_OT_shape_key_remove", icon="ICON_ZOOMOUT",
text="")
- col = row.column(align=True)
- col.itemO("OBJECT_OT_shape_key_add", icon="ICON_ZOOMIN",
text="")
- col.itemO("OBJECT_OT_shape_key_remove", icon="ICON_ZOOMOUT",
text="")
+ if kb:
+ col.itemS()
+ subcol = col.column(align=True)
+ subcol.itemR(ob, "shape_key_lock", icon="ICON_PINNED",
text="")
+ subcol.itemR(kb, "mute", icon="ICON_MUTE_IPO_ON",
text="")
+
+ if key.relative:
+ row = layout.row()
+ row.itemR(key, "relative")
+ row.itemL()
+
+ if ob.active_shape_key_index != 0:
+ if not ob.shape_key_lock:
+ row = layout.row(align=True)
+ row.itemR(kb, "value", text="")
+ row.itemR(kb, "slider_min",
text="Min")
+ row.itemR(kb, "slider_max",
text="Max")
+
+ row = layout.row()
+ row.item_pointerR(kb, "vertex_group",
ob, "vertex_groups", text="")
+ row.item_pointerR(kb, "relative_key",
key, "keys", text="")
+ else:
+ row = layout.row()
+ row.itemR(key, "relative")
+ row.itemR(key, "slurph")
+
if context.edit_object:
layout.enabled = False
Modified: branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py
===================================================================
--- branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py
2009-07-05 12:36:20 UTC (rev 21372)
+++ branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py
2009-07-05 15:20:19 UTC (rev 21373)
@@ -24,61 +24,63 @@
if box:
if md.type == 'ARMATURE':
self.armature(box, ob, md)
- if md.type == 'ARRAY':
+ elif md.type == 'ARRAY':
self.array(box, ob, md)
- if md.type == 'BEVEL':
+ elif md.type == 'BEVEL':
self.bevel(box, ob, md)
- if md.type == 'BOOLEAN':
+ elif md.type == 'BOOLEAN':
self.boolean(box, ob, md)
- if md.type == 'BUILD':
+ elif md.type == 'BUILD':
self.build(box, ob, md)
- if md.type == 'CAST':
+ elif md.type == 'CAST':
self.cast(box, ob, md)
- if md.type == 'CLOTH':
+ elif md.type == 'CLOTH':
self.cloth(box, ob, md)
- if md.type == 'COLLISION':
+ elif md.type == 'COLLISION':
self.collision(box, ob, md)
- if md.type == 'CURVE':
+ elif md.type == 'CURVE':
self.curve(box, ob, md)
- if md.type == 'DECIMATE':
+ elif md.type == 'DECIMATE':
self.decimate(box, ob, md)
- if md.type == 'DISPLACE':
+ elif md.type == 'DISPLACE':
self.displace(box, ob, md)
- if md.type == 'EDGE_SPLIT':
+ elif md.type == 'EDGE_SPLIT':
self.edgesplit(box, ob, md)
- if md.type == 'EXPLODE':
+ elif md.type == 'EXPLODE':
self.explode(box, ob, md)
- if md.type == 'FLUID_SIMULATION':
+ elif md.type == 'FLUID_SIMULATION':
self.fluid(box, ob, md)
- if md.type == 'HOOK':
+ elif md.type == 'HOOK':
self.hook(box, ob, md)
- if md.type == 'LATTICE':
+ elif md.type == 'LATTICE':
self.lattice(box, ob, md)
- if md.type == 'MASK':
+ elif md.type == 'MASK':
self.mask(box, ob, md)
- if md.type == 'MESH_DEFORM':
+ elif md.type == 'MESH_DEFORM':
self.mesh_deform(box, ob, md)
- if md.type == 'MIRROR':
+ elif md.type == 'MIRROR':
self.mirror(box, ob, md)
- if md.type == 'MULTIRES':
+ elif md.type == 'MULTIRES':
self.multires(box, ob, md)
- if md.type == 'PARTICLE_INSTANCE':
+ elif md.type == 'PARTICLE_INSTANCE':
self.particleinstance(box, ob, md)
- if md.type == 'PARTICLE_SYSTEM':
+ elif md.type == 'PARTICLE_SYSTEM':
self.particlesystem(box, ob, md)
- if md.type == 'SHRINKWRAP':
+ elif md.type == 'SHRINKWRAP':
self.shrinkwrap(box, ob, md)
- if md.type == 'SIMPLE_DEFORM':
+ elif md.type == 'SIMPLE_DEFORM':
self.simpledeform(box, ob, md)
- if md.type == 'SMOOTH':
+ elif md.type == 'SMOOTH':
self.smooth(box, ob, md)
- if md.type == 'SOFTBODY':
+ elif md.type == 'SOFTBODY':
self.softbody(box, ob, md)
- if md.type == 'SUBSURF':
+ elif md.type == 'SUBSURF':
self.subsurf(box, ob, md)
- if md.type == 'UV_PROJECT':
+ elif md.type == 'SURFACE':
+ self.surface(box, ob, md)
+ elif md.type == 'UV_PROJECT':
self.uvproject(box, ob, md)
- if md.type == 'WAVE':
+ elif md.type == 'WAVE':
self.wave(box, ob, md)
def armature(self, layout, ob, md):
@@ -96,9 +98,9 @@
layout.itemR(md, "fit_type")
if md.fit_type == 'FIXED_COUNT':
layout.itemR(md, "count")
- if md.fit_type == 'FIT_LENGTH':
+ elif md.fit_type == 'FIT_LENGTH':
layout.itemR(md, "length")
- if md.fit_type == 'FIT_CURVE':
+ elif md.fit_type == 'FIT_CURVE':
layout.itemR(md, "curve")
layout.itemS()
@@ -152,7 +154,7 @@
if md.limit_method == 'ANGLE':
row = layout.row()
row.itemR(md, "angle")
- if md.limit_method == 'WEIGHT':
+ elif md.limit_method == 'WEIGHT':
row = layout.row()
row.itemR(md, "edge_weight_method", expand=True)
@@ -211,7 +213,7 @@
layout.itemR(md, "texture_coordinates")
if md.texture_coordinates == 'OBJECT':
layout.itemR(md, "texture_coordinate_object",
text="Object")
- if md.texture_coordinates == 'UV' and ob.type == 'MESH':
+ elif md.texture_coordinates == 'UV' and ob.type == 'MESH':
layout.item_pointerR(md, "uv_layer", ob.data,
"uv_layers")
def edgesplit(self, layout, ob, md):
@@ -235,7 +237,7 @@
# Missing: "Refresh" and "Clear Vertex Group" ?
def fluid(self, layout, ob, md):
- layout.itemL(text="See Fluidsim panel.")
+ layout.itemL(text="See Fluid panel.")
def hook(self, layout, ob, md):
layout.itemR(md, "falloff")
@@ -252,7 +254,7 @@
layout.itemR(md, "mode")
if md.mode == 'ARMATURE':
layout.itemR(md, "armature")
- if md.mode == 'VERTEX_GROUP':
+ elif md.mode == 'VERTEX_GROUP':
layout.item_pointerR(md, "vertex_group", ob,
"vertex_groups")
layout.itemR(md, "inverse")
@@ -297,11 +299,22 @@
col = layout.column_flow()
col.itemR(md, "normal")
col.itemR(md, "children")
+ col.itemR(md, "size")
col.itemR(md, "path")
+ if md.path:
+ col.itemR(md, "keep_shape")
col.itemR(md, "unborn")
col.itemR(md, "alive")
col.itemR(md, "dead")
+ col.itemL(md, "")
+ if md.path:
+ col.itemR(md, "axis", text="")
+ if md.path:
+ row = layout.row()
+ row.itemR(md, "position", slider=True)
+ row.itemR(md, "random_position", text = "Random",
slider=True)
+
def particlesystem(self, layout, ob, md):
layout.itemL(text="See Particle panel.")
@@ -325,7 +338,7 @@
col.itemR(md, "positive")
col.itemR(md, "cull_front_faces")
col.itemR(md, "cull_back_faces")
- if md.mode == 'NEAREST_SURFACEPOINT':
+ elif md.mode == 'NEAREST_SURFACEPOINT':
layout.itemR(md, "keep_above_surface")
# To-Do: Validate if structs
@@ -353,7 +366,7 @@
layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
def softbody(self, layout, ob, md):
- layout.itemL(text="See Softbody panel.")
+ layout.itemL(text="See Soft Body panel.")
def subsurf(self, layout, ob, md):
layout.itemR(md, "subdivision_type")
@@ -362,6 +375,9 @@
col.itemR(md, "render_levels", text="Render")
col.itemR(md, "optimal_draw", text="Optimal Display")
col.itemR(md, "subsurf_uv")
+
+ def surface(self, layout, ob, md):
+ layout.itemL(text="See Fields panel.")
def uvproject(self, layout, ob, md):
if ob.type == 'MESH':
@@ -404,7 +420,7 @@
layout.itemR(md, "texture_coordinates")
if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH':
layout.item_pointerR(md, "uv_layer", ob.data,
"uv_layers")
- if md.texture_coordinates == 'OBJECT':
+ elif md.texture_coordinates == 'OBJECT':
layout.itemR(md, "texture_coordinates_object")
col = layout.column_flow()
Modified: branches/soc-2009-jaguarandi/release/ui/buttons_particle.py
===================================================================
--- branches/soc-2009-jaguarandi/release/ui/buttons_particle.py 2009-07-05
12:36:20 UTC (rev 21372)
+++ branches/soc-2009-jaguarandi/release/ui/buttons_particle.py 2009-07-05
15:20:19 UTC (rev 21373)
@@ -353,19 +353,14 @@
colsub.itemR(part, "adaptive_pix")
sub.itemR(part, "hair_bspline")
sub.itemR(part, "render_step", text="Steps")
- sub = split.column()
- sub.itemL(text="Length:")
- sub.itemR(part, "abs_length", text="Absolute")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
