Revision: 37033
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37033
Author: campbellbarton
Date: 2011-05-31 03:48:27 +0000 (Tue, 31 May 2011)
Log Message:
-----------
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36890
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/imbuf/intern/scaling.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-36890
+ /trunk/blender:31524-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36900
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-36890
+ /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-36900
Modified: branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/interface_layout.c 2011-05-31 02:55:29 UTC (rev 37032)
+++ branches/bmesh/blender/source/blender/editors/interface/interface_layout.c 2011-05-31 03:48:27 UTC (rev 37033)
@@ -729,6 +729,9 @@
RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
prop= RNA_struct_find_property(&ptr, propname);
+ /* don't let bad properties slip through */
+ BLI_assert((prop == NULL) || (RNA_property_type(prop) == PROP_ENUM));
+
if(prop && RNA_property_type(prop) == PROP_ENUM) {
EnumPropertyItem *item;
int totitem, i, free;
Property changes on: branches/bmesh/blender/source/blender/editors/render/render_update.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/source/blender/editors/render/render_update.c:36801-36890
+ /trunk/blender/source/blender/editors/render/render_update.c:36801-36900
Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h 2011-05-31 02:55:29 UTC (rev 37032)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h 2011-05-31 03:48:27 UTC (rev 37033)
@@ -84,6 +84,8 @@
void PAINT_OT_weight_paint(struct wmOperatorType *ot);
void PAINT_OT_weight_set(struct wmOperatorType *ot);
void PAINT_OT_weight_from_bones(struct wmOperatorType *ot);
+void PAINT_OT_weight_sample(struct wmOperatorType *ot);
+void PAINT_OT_weight_sample_group(struct wmOperatorType *ot);
void PAINT_OT_vertex_paint_toggle(struct wmOperatorType *ot);
void PAINT_OT_vertex_paint(struct wmOperatorType *ot);
Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c 2011-05-31 02:55:29 UTC (rev 37032)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c 2011-05-31 03:48:27 UTC (rev 37033)
@@ -370,6 +370,8 @@
WM_operatortype_append(PAINT_OT_weight_paint);
WM_operatortype_append(PAINT_OT_weight_set);
WM_operatortype_append(PAINT_OT_weight_from_bones);
+ WM_operatortype_append(PAINT_OT_weight_sample);
+ WM_operatortype_append(PAINT_OT_weight_sample_group);
@@ Diff output truncated at 10240 characters. @@