Merged changes in the trunk up to revision 38893.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Aug 2011 20:18:02 +0000 (20:18 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Aug 2011 20:18:02 +0000 (20:18 +0000)
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/material.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

Simple merge
index f073a7b79f03420c1fee6e671e712f9442978d3a,f4028e45e965e18bd2a95f4d0e7b4bbf01d78468..1dc3bb4daf9baa5699e4a1a11d85d82025b33a2c
@@@ -1223,10 -1177,10 +1223,10 @@@ static void rna_def_tool_settings(Blend
        RNA_def_property_ui_text(prop, "Project Individual Elements", "Project individual elements on the surface of other objects");
        RNA_def_property_ui_icon(prop, ICON_RETOPO, 0);
        RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
 -
 +      
-       prop= RNA_def_property(srna, "use_snap_project_self", PROP_BOOLEAN, PROP_NONE);
-       RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag", SCE_SNAP_PROJECT_NO_SELF);
-       RNA_def_property_ui_text(prop, "Project to Self", "Project into its self (editmode)");
+       prop= RNA_def_property(srna, "use_snap_self", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag", SCE_SNAP_NO_SELF);
+       RNA_def_property_ui_text(prop, "Project to Self", "Snap onto its self (editmode)");
        RNA_def_property_ui_icon(prop, ICON_ORTHO, 0);
        RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
        
Simple merge