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

Jingyuan Huang jingyuan.huang at gmail.com
Mon Jul 20 16:07:30 CEST 2009


Revision: 21720
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21720
Author:   yukishiro
Date:     2009-07-20 16:07:30 +0200 (Mon, 20 Jul 2009)

Log Message:
-----------
merge till 21719

Modified Paths:
--------------
    branches/soc-2009-yukishiro/CMakeLists.txt
    branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
    branches/soc-2009-yukishiro/config/win32-mingw-config.py
    branches/soc-2009-yukishiro/extern/binreloc/CMakeLists.txt
    branches/soc-2009-yukishiro/extern/binreloc/Makefile
    branches/soc-2009-yukishiro/release/datafiles/preview.blend
    branches/soc-2009-yukishiro/release/io/export_ply.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
    branches/soc-2009-yukishiro/release/ui/buttons_material.py
    branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
    branches/soc-2009-yukishiro/release/ui/buttons_objects.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_field.py
    branches/soc-2009-yukishiro/release/ui/buttons_physics_fluid.py
    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/buttons_texture.py
    branches/soc-2009-yukishiro/release/ui/buttons_world.py
    branches/soc-2009-yukishiro/release/ui/space_console.py
    branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
    branches/soc-2009-yukishiro/release/ui/space_image.py
    branches/soc-2009-yukishiro/release/ui/space_info.py
    branches/soc-2009-yukishiro/release/ui/space_outliner.py
    branches/soc-2009-yukishiro/release/ui/space_sequencer.py
    branches/soc-2009-yukishiro/release/ui/space_text.py
    branches/soc-2009-yukishiro/release/ui/space_view3d.py
    branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/colortools.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/object.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/report.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_arithb.h
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_fileops.h
    branches/soc-2009-yukishiro/source/blender/blenlib/SConscript
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/arithb.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/fileops.c
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
    branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/poselib.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
    branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-yukishiro/source/blender/editors/datafiles/preview.blend.c
    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_keyframes_draw.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_object.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.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/preview/previewrender.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/glutil.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_context.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_select.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_console/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/space_console/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_console/console_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_console/console_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_console/console_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_console/space_console.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_image/image_render.c
    branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform.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/imbuf/IMB_imbuf_types.h
    branches/soc-2009-yukishiro/source/blender/imbuf/intern/divers.c
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_vpaint.c
    branches/soc-2009-yukishiro/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.c
    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/python/intern/bpy_util.c
    branches/soc-2009-yukishiro/source/blender/python/intern/bpy_util.h
    branches/soc-2009-yukishiro/source/blender/render/intern/include/shading.h
    branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/pixelshading.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/rayshade.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/shadeinput.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/sss.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/strand.c
    branches/soc-2009-yukishiro/source/blender/render/intern/source/texture.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
    branches/soc-2009-yukishiro/source/creator/creator.c
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2009-yukishiro/release/ui/bpy_ops.py
    branches/soc-2009-yukishiro/source/blender/blenlib/BLI_dlrbTree.h
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2009-yukishiro/source/blender/editors/space_console/console_report.c

Removed Paths:
-------------
    branches/soc-2009-yukishiro/release/beos-4.5-i386/
    branches/soc-2009-yukishiro/release/beos-5.0-i386/

Property Changed:
----------------
    branches/soc-2009-yukishiro/source/blender/python/generic/BGL.h

Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/CMakeLists.txt	2009-07-20 14:07:30 UTC (rev 21720)
@@ -63,6 +63,7 @@
 OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
 OPTION(WITH_PYTHON		"Enable Embedded Python API"				ON)
+OPTION(WITH_SDL			"Enable SDL for sound and joystick support"				ON)
 OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
@@ -133,9 +134,11 @@
   SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
-  FIND_PACKAGE(SDL)
-  SET(SDL_INC ${SDL_INCLUDE_DIR})
-  SET(SDL_LIB ${SDL_LIBRARY})
+  IF(WITH_SDL)
+    FIND_PACKAGE(SDL)
+    SET(SDL_INC ${SDL_INCLUDE_DIR})
+    SET(SDL_LIB ${SDL_LIBRARY})
+  ENDIF(WITH_SDL)
 
   FIND_PATH(OPENEXR_INC
     ImfXdr.h

Modified: branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt	2009-07-20 14:07:30 UTC (rev 21720)
@@ -32,10 +32,10 @@
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c

Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-07-20 14:07:30 UTC (rev 21720)
@@ -148,7 +148,7 @@
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
 BF_PROFILE = False

Modified: branches/soc-2009-yukishiro/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/extern/binreloc/CMakeLists.txt	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/extern/binreloc/CMakeLists.txt	2009-07-20 14:07:30 UTC (rev 21720)
@@ -18,8 +18,8 @@
 # All rights reserved.
 #
 
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
+SET(INC ./include )
+ADD_DEFINITIONS(-DENABLE_BINRELOC)
 FILE(GLOB SRC *.c)
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")

Modified: branches/soc-2009-yukishiro/extern/binreloc/Makefile
===================================================================
--- branches/soc-2009-yukishiro/extern/binreloc/Makefile	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/extern/binreloc/Makefile	2009-07-20 14:07:30 UTC (rev 21720)
@@ -27,7 +27,7 @@
 
 include nan_definitions.mk
 
-CPPFLAGS += -I./include
+CPPFLAGS += -DENABLE_BINRELOC -I./include
 
 
 include nan_compile.mk

Modified: branches/soc-2009-yukishiro/release/datafiles/preview.blend
===================================================================
(Binary files differ)

Modified: branches/soc-2009-yukishiro/release/io/export_ply.py
===================================================================
--- branches/soc-2009-yukishiro/release/io/export_ply.py	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/release/io/export_ply.py	2009-07-20 14:07:30 UTC (rev 21720)
@@ -240,6 +240,7 @@
 	'''
 	Operator documentatuon text, will be used for the operator tooltip and python docs.
 	'''
+	__idname__ = "export.ply"
 	__label__ = "Export PLY"
 	
 	# List of operator properties, the attributes will be assigned

Copied: branches/soc-2009-yukishiro/release/ui/bpy_ops.py (from rev 21719, branches/blender2.5/blender/release/ui/bpy_ops.py)
===================================================================
--- branches/soc-2009-yukishiro/release/ui/bpy_ops.py	                        (rev 0)
+++ branches/soc-2009-yukishiro/release/ui/bpy_ops.py	2009-07-20 14:07:30 UTC (rev 21720)
@@ -0,0 +1,103 @@
+# for slightly faster access
+from bpy.__ops__ import add		as op_add
+from bpy.__ops__ import remove		as op_remove
+from bpy.__ops__ import dir		as op_dir
+from bpy.__ops__ import call		as op_call
+
+class bpy_ops(object):
+	'''
+	Fake module like class.
+	
+	 bpy.ops
+	'''
+	def add(self, pyop):
+		op_add(pyop)
+	
+	def remove(self, pyop):
+		op_remove(pyop)
+	
+	def __getattr__(self, module):
+		'''
+		gets a bpy.ops submodule
+		'''
+		return bpy_ops_submodule(module)
+		
+	def __dir__(self):
+		
+		submodules = set()
+		
+		# add this classes functions
+		for id_name in dir(self.__class__):
+			if not id_name.startswith('__'):
+				submodules.add(id_name)
+		
+		for id_name in op_dir():
+			id_split = id_name.split('_OT_', 1)
+			
+			if len(id_split) == 2:
+				submodules.add(id_split[0].lower())
+			else:
+				submodules.add(id_split[0])
+		
+		return list(submodules)
+		
+	def __repr__(self):
+		return "<module like class 'bpy.ops'>"
+
+
+class bpy_ops_submodule(object):
+	'''
+	Utility class to fake submodules.
+	
+	eg. bpy.ops.object
+	'''
+	__keys__ = ('module',)
+	
+	def __init__(self, module):
+		self.module = module
+		
+	def __getattr__(self, func):
+		'''
+		gets a bpy.ops.submodule function
+		'''
+		return bpy_ops_submodule_op(self.module, func)
+		
+	def __dir__(self):
+		
+		functions = set()
+		
+		module_upper = self.module.upper()
+		
+		for id_name in op_dir():
+			id_split = id_name.split('_OT_', 1)
+			if len(id_split) == 2 and module_upper == id_split[0]:
+				functions.add(id_split[1])
+		
+		return list(functions)
+	
+	def __repr__(self):
+		return "<module like class 'bpy.ops.%s'>" % self.module
+
+class bpy_ops_submodule_op(object):
+	'''
+	Utility class to fake submodule operators.
+	
+	eg. bpy.ops.object.somefunc
+	'''
+	__keys__ = ('module', 'func')
+	def __init__(self, module, func):
+		self.module = module
+		self.func = func
+	
+	def __call__(self, **kw):
+		# submod.foo -> SUBMOD_OT_foo
+		id_name = self.module.upper() + '_OT_' + self.func
+		
+		# Get the operator from 
+		return op_call(id_name, kw)
+		
+	def __repr__(self):
+		return "<function bpy.ops.%s.%s at 0x%x'>" % (self.module, self.func, id(self))
+
+import bpy
+bpy.ops = bpy_ops()

Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py	2009-07-20 14:07:30 UTC (rev 21720)
@@ -52,7 +52,7 @@
 		row.itemR(lat, "interpolation_type_w", expand=True)
 			
 		row = layout.row()
-		row.itemO("LATTICE_OT_make_regular")
+		row.itemO("lattice.make_regular")
 		row.itemR(lat, "outside")
 
 bpy.types.register(DATA_PT_context_lattice)

Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py	2009-07-20 12:42:31 UTC (rev 21719)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py	2009-07-20 14:07:30 UTC (rev 21720)
@@ -68,15 +68,15 @@
 		row.template_list(ob, "materials", ob, "active_material_index")
 
 		col = row.column(align=True)
-		col.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("OBJECT_OT_material_slot_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("object.material_slot_add", icon="ICON_ZOOMIN", text="")
+		col.itemO("object.material_slot_remove", icon="ICON_ZOOMOUT", text="")
 
 		if context.edit_object:
 			row = layout.row(align=True)
 
-			row.itemO("OBJECT_OT_material_slot_assign", text="Assign")
-			row.itemO("OBJECT_OT_material_slot_select", text="Select")
-			row.itemO("OBJECT_OT_material_slot_deselect", text="Deselect")
+			row.itemO("object.material_slot_assign", text="Assign")
+			row.itemO("object.material_slot_select", text="Select")
+			row.itemO("object.material_slot_deselect", text="Deselect")
 
 		"""
 		layout.itemS()
@@ -87,8 +87,8 @@
 		row.template_list(ob, "materials", ob, "active_material_index", compact=True)
 
 		subrow = row.row(align=True)
-		subrow.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")
-		subrow.itemO("OBJECT_OT_material_slot_remove", icon="ICON_ZOOMOUT", text="")
+		subrow.itemO("object.material_slot_add", icon="ICON_ZOOMIN", text="")
+		subrow.itemO("object.material_slot_remove", icon="ICON_ZOOMOUT", text="")
 		"""
 
 class DATA_PT_vertex_groups(DataButtonsPanel):
@@ -107,20 +107,20 @@
 		row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index")
 
 		col = row.column(align=True)
-		col.itemO("OBJECT_OT_vertex_group_add", icon="ICON_ZOOMIN", text="")
-		col.itemO("OBJECT_OT_vertex_group_remove", icon="ICON_ZOOMOUT", text="")
+		col.itemO("object.vertex_group_add", icon="ICON_ZOOMIN", text="")
+		col.itemO("object.vertex_group_remove", icon="ICON_ZOOMOUT", text="")
 
-		col.itemO("OBJECT_OT_vertex_group_copy", icon="ICON_BLANK1", text="")
+		col.itemO("object.vertex_group_copy", icon="ICON_BLANK1", text="")
 		if ob.data.users > 1:
-			col.itemO("OBJECT_OT_vertex_group_copy_to_linked", icon="ICON_BLANK1", text="")
+			col.itemO("object.vertex_group_copy_to_linked", icon="ICON_BLANK1", text="")
 
 		if context.edit_object:
 			row = layout.row(align=True)
 
-			row.itemO("OBJECT_OT_vertex_group_assign", text="Assign")
-			row.itemO("OBJECT_OT_vertex_group_remove_from", text="Remove")
-			row.itemO("OBJECT_OT_vertex_group_select", text="Select")
-			row.itemO("OBJECT_OT_vertex_group_deselect", text="Deselect")
+			row.itemO("object.vertex_group_assign", text="Assign")
+			row.itemO("object.vertex_group_remove_from", text="Remove")
+			row.itemO("object.vertex_group_select", text="Select")
+			row.itemO("object.vertex_group_deselect", text="Deselect")
 
 			layout.itemR(context.tool_settings, "vertex_group_weight", text="Weight")
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list