[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21171] branches/soc-2009-yukishiro: merge till 21169 (with a fix in SH_eval_color)
Jingyuan Huang
jingyuan.huang at gmail.com
Fri Jun 26 17:36:47 CEST 2009
Revision: 21171
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21171
Author: yukishiro
Date: 2009-06-26 17:36:45 +0200 (Fri, 26 Jun 2009)
Log Message:
-----------
merge till 21169 (with a fix in SH_eval_color)
Modified Paths:
--------------
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/blender/SConscript
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_material.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_listbase.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_noise.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_rect.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_string.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/dynamiclist.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/dynamiclist.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/listbase.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/string.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/Makefile
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_channels.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_intern.h
branches/soc-2009-yukishiro/source/blender/editors/animation/drivers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyingsets.c
branches/soc-2009-yukishiro/source/blender/editors/armature/Makefile
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-yukishiro/source/blender/editors/curve/Makefile
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/curve/editfont.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/Bfont.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/Makefile
branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-yukishiro/source/blender/editors/gpencil/Makefile
branches/soc-2009-yukishiro/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2009-yukishiro/source/blender/editors/include/BIF_gl.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_curve.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_fluidsim.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_mesh.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_particle.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_pointcache.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_resources.h
branches/soc-2009-yukishiro/source/blender/editors/interface/Makefile
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_draw.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_icons.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/Makefile
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-yukishiro/source/blender/editors/object/Makefile
branches/soc-2009-yukishiro/source/blender/editors/physics/Makefile
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/preview/Makefile
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/screen/Makefile
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/sculpt_paint/Makefile
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_action/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_info/info_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_node/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_sound/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_text/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_time/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/Makefile
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/space_view3d/view3d_toolbar.c
branches/soc-2009-yukishiro/source/blender/editors/transform/Makefile
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/editors/util/Makefile
branches/soc-2009-yukishiro/source/blender/editors/uvedit/Makefile
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_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/Makefile
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lattice.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_packedfile.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_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.h
branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
branches/soc-2009-yukishiro/source/blender/python/generic/euler.h
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.h
branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
branches/soc-2009-yukishiro/source/blender/python/generic/quat.h
branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
branches/soc-2009-yukishiro/source/blender/python/generic/vector.h
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/sh/intern/compute.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/Makefile
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_cursors.h
branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/KX_Python.h
branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
Property Changed:
----------------
branches/soc-2009-yukishiro/config/win64-vc-config.py
branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
branches/soc-2009-yukishiro/source/blender/blenfont/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/blenfont/Makefile
branches/soc-2009-yukishiro/source/blender/blenfont/intern/Makefile
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_dir.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_lang.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_util.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_listbase.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_noise.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_rect.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_string.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/dynamiclist.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/dynamiclist.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/listbase.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/string.c
branches/soc-2009-yukishiro/source/blender/editors/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/editors/Makefile
branches/soc-2009-yukishiro/source/blender/editors/animation/Makefile
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_channels.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_deps.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_filter.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_intern.h
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_markers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_ops.c
branches/soc-2009-yukishiro/source/blender/editors/animation/drivers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_edit.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_general.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyingsets.c
branches/soc-2009-yukishiro/source/blender/editors/armature/BIF_generate.h
branches/soc-2009-yukishiro/source/blender/editors/armature/BIF_retarget.h
branches/soc-2009-yukishiro/source/blender/editors/armature/Makefile
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_generate.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-yukishiro/source/blender/editors/armature/meshlaplacian.c
branches/soc-2009-yukishiro/source/blender/editors/armature/meshlaplacian.h
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/Makefile
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/datafiles/B.blend.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/Bfont.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/Makefile
branches/soc-2009-yukishiro/source/blender/editors/datafiles/bfont.ttf.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/bmonofont.ttf.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/splash.jpg.c
branches/soc-2009-yukishiro/source/blender/editors/gpencil/Makefile
branches/soc-2009-yukishiro/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2009-yukishiro/source/blender/editors/gpencil/gpencil_intern.h
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_anim_api.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_curve.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_datafiles.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_fluidsim.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_image.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_interface.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_markers.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_mesh.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_node.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_object.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_particle.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_pointcache.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_sculpt.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_sequencer.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_space_api.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_text.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_types.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_util.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_uvedit.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_view3d.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/include/UI_resources.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_view2d.h
branches/soc-2009-yukishiro/source/blender/editors/interface/Makefile
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_anim.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_draw.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/Makefile
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/object/Makefile
branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
branches/soc-2009-yukishiro/source/blender/editors/object/object_modifier.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
branches/soc-2009-yukishiro/source/blender/editors/physics/Makefile
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/physics/physics_intern.h
branches/soc-2009-yukishiro/source/blender/editors/preview/Makefile
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender_intern.h
branches/soc-2009-yukishiro/source/blender/editors/screen/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/editors/screen/Makefile
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_intern.h
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/Makefile
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt_stroke.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_intern.h
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_action/space_action.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_api/space.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_info/info_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/info_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_info/space_info.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/space_logic.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_header.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_node/node_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_state.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/space_node.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/space_script.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_buttons.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_sequencer/space_sequencer.c
branches/soc-2009-yukishiro/source/blender/editors/space_sound/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_sound/sound_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_sound/sound_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_sound/space_sound.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_python.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_time/space_time.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/Makefile
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_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/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/editors/transform/Makefile
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ndofinput.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/util/Makefile
branches/soc-2009-yukishiro/source/blender/editors/util/ed_util.c
branches/soc-2009-yukishiro/source/blender/editors/util/undo.c
branches/soc-2009-yukishiro/source/blender/editors/util/util_intern.h
branches/soc-2009-yukishiro/source/blender/editors/uvedit/Makefile
branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2009-yukishiro/source/blender/makesrna/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/makesrna/Makefile
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/makesrna/intern/Makefile
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_color.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_group.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_main.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh_api.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_packedfile.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_property.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scriptlink.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sound.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_text.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/windowmanager/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/windowmanager/Makefile
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/Makefile
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.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_jobs.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_cursors.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_draw.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_event_system.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_event_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_files.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_subwindow.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_window.h
Property changes on: branches/soc-2009-yukishiro/config/win64-vc-config.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-06-26 15:36:45 UTC (rev 21171)
@@ -46,6 +46,34 @@
sub.itemR(mesh, "vertex_normal_flip")
sub.itemR(mesh, "double_sided")
- layout.itemR(mesh, "texco_mesh")
-
+ layout.itemR(mesh, "texco_mesh")
+
+
+class DATA_PT_materials(DataButtonsPanel):
+ __idname__ = "DATA_PT_materials"
+ __label__ = "Materials"
+
+ def poll(self, context):
+ return (context.object and context.object.type in ('MESH', 'CURVE', 'FONT', 'SURFACE'))
+
+ def draw(self, context):
+ layout = self.layout
+ ob = context.object
+
+ row = layout.row()
+
+ row.template_list(ob, "materials", "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="")
+
+ 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");
+
bpy.types.register(DATA_PT_mesh)
+bpy.types.register(DATA_PT_materials)
+
Modified: branches/soc-2009-yukishiro/release/ui/space_text.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_text.py 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/release/ui/space_text.py 2009-06-26 15:36:45 UTC (rev 21171)
@@ -1,10 +1,6 @@
import bpy
-# temporary
-ICON_TEXT = 120
-ICON_HELP = 1
-
class TEXT_HT_header(bpy.types.Header):
__space_type__ = "TEXT_EDITOR"
__idname__ = "TEXT_HT_header"
Modified: branches/soc-2009-yukishiro/source/blender/SConscript
===================================================================
--- branches/soc-2009-yukishiro/source/blender/SConscript 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/SConscript 2009-06-26 15:36:45 UTC (rev 21171)
@@ -13,9 +13,9 @@
'imbuf/intern/cineon/SConscript',
'makesdna/SConscript',
'makesrna/SConscript',
- 'nodes/SConscript',
'readblenfile/SConscript',
'render/SConscript',
+ 'nodes/SConscript',
'sh/SConscript',
'windowmanager/SConscript',
'blenfont/SConscript'])
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/Makefile
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/Makefile
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_dir.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h 2009-06-26 15:36:45 UTC (rev 21171)
@@ -1,5 +1,5 @@
/**
- * $Id: blf_internal_types.h 21108 2009-06-23 16:27:35Z bdiego $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_lang.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_util.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h 2009-06-26 15:36:45 UTC (rev 21171)
@@ -131,6 +131,7 @@
- the dir listbase consits of LinkData items */
PointerRNA CTX_data_pointer_get(const bContext *C, const char *member);
+PointerRNA CTX_data_pointer_get_type(const bContext *C, const char *member, StructRNA *type);
ListBase CTX_data_collection_get(const bContext *C, const char *member);
ListBase CTX_data_dir_get(const bContext *C);
void CTX_data_get(const bContext *C, const char *member, PointerRNA *r_ptr, ListBase *r_lb);
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_material.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_material.h 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_material.h 2009-06-26 15:36:45 UTC (rev 21171)
@@ -39,6 +39,8 @@
struct ID;
struct Object;
+/* materials */
+
void init_def_material(void);
void free_material(struct Material *sc);
void test_object_materials(struct ID *id);
@@ -47,16 +49,23 @@
struct Material *copy_material(struct Material *ma);
void make_local_material(struct Material *ma);
+void automatname(struct Material *);
+
+/* material slots */
+
struct Material ***give_matarar(struct Object *ob);
short *give_totcolp(struct Object *ob);
struct Material *give_current_material(struct Object *ob, int act);
struct ID *material_from(struct Object *ob, int act);
void assign_material(struct Object *ob, struct Material *ma, int act);
-void new_material_to_objectdata(struct Object *ob);
int find_material_index(struct Object *ob, struct Material *ma);
+void object_add_material_slot(struct Object *ob);
+void object_remove_material_slot(struct Object *ob);
+/* rendering */
+
void init_render_material(struct Material *, int, float *);
void init_render_materials(int, float *);
void end_render_material(struct Material *);
@@ -64,12 +73,8 @@
int material_in_material(struct Material *parmat, struct Material *mat);
-void automatname(struct Material *);
-void delete_material_index(struct Object *ob);
-
void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col);
-
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c 2009-06-26 15:36:45 UTC (rev 21171)
@@ -365,15 +365,20 @@
{
bContextDataResult result;
- if(ctx_data_get((bContext*)C, member, &result)) {
+ if(ctx_data_get((bContext*)C, member, &result))
return result.ptr;
- }
- else {
- PointerRNA ptr;
- memset(&ptr, 0, sizeof(ptr));
+ else
+ return PointerRNA_NULL;
+}
+
+PointerRNA CTX_data_pointer_get_type(const bContext *C, const char *member, StructRNA *type)
+{
+ PointerRNA ptr = CTX_data_pointer_get(C, member);
+
+ if(ptr.data && ptr.type == type)
return ptr;
- }
-
+
+ return PointerRNA_NULL;
}
ListBase CTX_data_collection_get(const bContext *C, const char *member)
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c 2009-06-26 15:09:39 UTC (rev 21170)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c 2009-06-26 15:36:45 UTC (rev 21171)
@@ -615,7 +615,7 @@
return 0;
}
-void new_material_to_objectdata(Object *ob)
+void object_add_material_slot(Object *ob)
{
Material *ma;
@@ -854,7 +854,7 @@
}
-void delete_material_index(Object *ob)
+void object_remove_material_slot(Object *ob)
{
Material *mao, ***matarar;
Object *obt;
Modified: branches/soc-2009-yukishiro/source/blender/blenlib/BLI_listbase.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list