[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21451] branches/soc-2009-yukishiro: merge till 21450

Jingyuan Huang jingyuan.huang at gmail.com
Thu Jul 9 05:25:33 CEST 2009


Revision: 21451
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21451
Author:   yukishiro
Date:     2009-07-09 05:25:31 +0200 (Thu, 09 Jul 2009)

Log Message:
-----------
merge till 21450

Modified Paths:
--------------
    branches/soc-2009-yukishiro/config/win32-mingw-config.py
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
    branches/soc-2009-yukishiro/release/ui/buttons_scene.py
    branches/soc-2009-yukishiro/release/ui/space_image.py
    branches/soc-2009-yukishiro/release/ui/space_sequencer.py
    branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
    branches/soc-2009-yukishiro/source/Makefile
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_graph.h
    branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/armature_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/reeb.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/reeb.h
    branches/soc-2009-yukishiro/source/blender/editors/curve/curve_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/curve/curve_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
    branches/soc-2009-yukishiro/source/blender/editors/include/BIF_gl.h
    branches/soc-2009-yukishiro/source/blender/editors/include/BIF_glutil.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_mesh.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_icons.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_icons.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/node_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/node_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_node/node_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform.h
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_snap.c
    branches/soc-2009-yukishiro/source/blender/editors/util/undo.c
    branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sequence.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_compat.h
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInit.cpp

Added Paths:
-----------
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_retopo.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h

Removed Paths:
-------------
    branches/soc-2009-yukishiro/source/blender/editors/include/BIF_retopo.h
    branches/soc-2009-yukishiro/source/blender/editors/include/BIF_transform.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/keyval.c

Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -3,12 +3,16 @@
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
+#BF_PYTHON_VERSION = '2.6'
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python25'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+#BF_PYTHON_LIB = 'python25'
+#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
+#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False

Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-07-09 03:25:31 UTC (rev 21451)
@@ -182,14 +182,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\include\BIF_retopo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\source\blender\editors\include\BIF_transform.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_anim_api.h"
 				>
 			</File>
@@ -262,6 +254,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_physics.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_pointcache.h"
 				>
 			</File>
@@ -270,6 +266,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_retopo.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_screen.h"
 				>
 			</File>
@@ -427,10 +427,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\interface\keyval.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\source\blender\editors\interface\resources.c"
 				>
 			</File>

Modified: branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -90,7 +90,7 @@
 			col.itemL(text="Goal Settings:")
 			col.itemR(softbody, "goal_spring", text="Stiffness")
 			col.itemR(softbody, "goal_friction", text="Damping")
-			layout.itemR(softbody, "goal_vertex_group", text="Vertex Group")
+			layout.item_pointerR(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group")
 
 class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
 	__idname__ = "PHYSICS_PT_softbody_edge"

Modified: branches/soc-2009-yukishiro/release/ui/buttons_scene.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_scene.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/release/ui/buttons_scene.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -274,4 +274,4 @@
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
 bpy.types.register(RENDER_PT_output)
-bpy.types.register(RENDER_PT_stamp)
\ No newline at end of file
+bpy.types.register(RENDER_PT_stamp)

Modified: branches/soc-2009-yukishiro/release/ui/space_image.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_image.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/release/ui/space_image.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -13,7 +13,7 @@
 
 		show_uvedit = sima.show_uvedit
 
-		layout.itemO("IMAGE_OT_properties") # icon
+		layout.itemO("IMAGE_OT_properties", icon="ICON_MENU_PANEL")
 
 		layout.itemS()
 
@@ -55,7 +55,7 @@
 		layout.itemS()
 		
 		layout.itemO("UV_OT_select_all_toggle")
-		layout.itemO("UV_OT_select_invert")
+		layout.itemO("UV_OT_select_inverse")
 		layout.itemO("UV_OT_unlink_selection")
 		
 		layout.itemS()
@@ -257,8 +257,6 @@
 		if show_uvedit:
 			uvedit = sima.uv_editor
 
-			layout.itemS()
-
 			layout.itemR(uvedit, "pivot", text="")
 			layout.itemR(settings, "uv_sync_selection", text="")
 

Modified: branches/soc-2009-yukishiro/release/ui/space_sequencer.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_sequencer.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/release/ui/space_sequencer.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -90,6 +90,10 @@
 		"""
 		
 		layout.itemR(st, "draw_frames")
+		if st.display_mode == 'IMAGE':
+			layout.itemR(st, "draw_safe_margin")
+		if st.display_mode == 'WAVEFORM':
+			layout.itemR(st, "seperate_color_preview")
 		
 		"""
 	if(!sa->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,0, "");
@@ -115,7 +119,7 @@
 		layout.itemS()
 		layout.itemO("SEQUENCER_OT_select_linked")
 		layout.itemO("SEQUENCER_OT_select_all_toggle")
-		layout.itemO("SEQUENCER_OT_select_invert")
+		layout.itemO("SEQUENCER_OT_select_inverse")
 
 class SEQUENCER_MT_marker(bpy.types.Menu):
 	__space_type__ = "SEQUENCE_EDITOR"
@@ -198,7 +202,7 @@
 		layout.itemO("SEQUENCER_OT_images_separate")
 		layout.itemS()
 		
-		layout.itemO("SEQUENCER_OT_duplicate_add")
+		layout.itemO("SEQUENCER_OT_duplicate")
 		layout.itemO("SEQUENCER_OT_delete")
 		
 		strip = act_strip(context)

Modified: branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py	2009-07-09 03:25:31 UTC (rev 21451)
@@ -15,7 +15,7 @@
 	def draw(self, context):
 		layout = self.layout
 
-		layout.row().itemO("OBJECT_OT_duplicate_add")
+		layout.row().itemO("OBJECT_OT_duplicate")
 		layout.row().itemO("OBJECT_OT_delete")
 		layout.row().itemO("OBJECT_OT_mesh_add")
 		layout.row().itemO("OBJECT_OT_curve_add")
@@ -36,7 +36,7 @@
 	def draw(self, context):
 		layout = self.layout
 
-		layout.row().itemO("MESH_OT_duplicate_add")
+		layout.row().itemO("MESH_OT_duplicate")
 		layout.row().itemO("MESH_OT_delete")
 		layout.row().itemO("MESH_OT_spin")
 		layout.row().itemO("MESH_OT_screw")

Modified: branches/soc-2009-yukishiro/source/Makefile
===================================================================
--- branches/soc-2009-yukishiro/source/Makefile	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/source/Makefile	2009-07-09 03:25:31 UTC (rev 21451)
@@ -83,7 +83,6 @@
 GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
 GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
 GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
-GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
 
 # nlin: the reason that some libraries appear more than once below is
 # to handle circular dependencies in linking among libraries... some
@@ -221,8 +220,8 @@
 PULIB += $(OCGDIR)/blender/ed_file/$(DEBUG_DIR)libed_file.a
 PULIB += $(OCGDIR)/blender/ed_info/$(DEBUG_DIR)libed_info.a
 PULIB += $(OCGDIR)/blender/ed_buttons/$(DEBUG_DIR)libed_buttons.a
-PULIB += $(OCGDIR)/blender/ed_node/$(DEBUG_DIR)libed_node.a
 PULIB += $(OCGDIR)/blender/ed_graph/$(DEBUG_DIR)libed_graph.a
+PULIB += $(OCGDIR)/blender/ed_node/$(DEBUG_DIR)libed_node.a
 PULIB += $(OCGDIR)/blender/ed_outliner/$(DEBUG_DIR)libed_outliner.a
 PULIB += $(OCGDIR)/blender/ed_time/$(DEBUG_DIR)libed_time.a
 PULIB += $(OCGDIR)/blender/ed_preview/$(DEBUG_DIR)libed_preview.a

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c	2009-07-09 03:25:31 UTC (rev 21451)
@@ -184,11 +184,11 @@
 	if(seq->anim) IMB_free_anim(seq->anim);
 	//XXX if(seq->hdaudio) sound_close_hdaudio(seq->hdaudio);
 
-	/* XXX if (seq->type & SEQ_EFFECT) {
+	if (seq->type & SEQ_EFFECT) {
 		struct SeqEffectHandle sh = get_sequence_effect(seq);
 
 		sh.free(seq);
-	}*/
+	}
 
 	if (ed->act_seq==seq)
 		ed->act_seq= NULL;

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/subsurf_ccg.c	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/subsurf_ccg.c	2009-07-09 03:25:31 UTC (rev 21451)
@@ -60,6 +60,7 @@
 #include "BLI_edgehash.h"
 
 #include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "GPU_draw.h"
 #include "GPU_extensions.h"

Modified: branches/soc-2009-yukishiro/source/blender/blenlib/BLI_graph.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenlib/BLI_graph.h	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/source/blender/blenlib/BLI_graph.h	2009-07-09 03:25:31 UTC (rev 21451)
@@ -88,6 +88,7 @@
 	StoppedFct	stopped;
 	
 	float *p, *no;
+	float size;
 	
 	int length;
 	int index;

Modified: branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c	2009-07-09 02:45:48 UTC (rev 21450)
+++ branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c	2009-07-09 03:25:31 UTC (rev 21451)
@@ -9131,7 +9131,7 @@
 				void *olddata = ob->data;

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list