Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- bugfix [#23407] vertex painting on a mesh with no face segfaults

Browse Source 
- removed animsys update values that dont need animating.
This commit is contained in:
Campbell Barton
2010-08-22 06:31:26 +00:00
parent c2036fda5d
commit 4ca9a7e9c1
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
release/scripts/op/animsys_update.py
View File

@@ -19,10 +19,6 @@
# <pep8 compliant>
data_path_update = [
("AnimVizMotionPaths", "after_current", "frame_after"),
("AnimVizMotionPaths", "before_current", "frame_before"),
("AnimVizOnionSkinning", "after_current", "frame_after"),
("AnimVizOnionSkinning", "before_current", "frame_before"),
("ClothCollisionSettings", "min_distance", "distance_min"),
("ClothCollisionSettings", "self_min_distance", "self_distance_min"),
("ClothCollisionSettings", "enable_collision", "use_collision"),
@@ -117,18 +113,6 @@ data_path_update = [
("OutflowFluidSettings", "export_animated_mesh", "use_animated_mesh"),
("ParticleFluidSettings", "drops", "use_drops"),
("ParticleFluidSettings", "floats", "use_floats"),
("GameSoftBodySettings", "linstiff", "linear_stiffness"),
("GameSoftBodySettings", "position_iterations", "location_iterations"),
("GameSoftBodySettings", "bending_const", "use_bending_constraints"),
("GameSoftBodySettings", "cluster_rigid_to_softbody", "use_cluster_rigid_to_softbody"),
("GameSoftBodySettings", "cluster_soft_to_softbody", "use_cluster_soft_to_softbody"),
("GameSoftBodySettings", "shape_match", "use_shape_match"),
("NetRenderSettings", "master_broadcast", "use_master_broadcast"),
("NetRenderSettings", "master_clear", "use_master_clear"),
("NetRenderSettings", "slave_clear", "use_slave_clear"),
("NetRenderSettings", "slave_outputlog", "use_slave_output_log"),
("NetRenderSettings", "slave_thumb", "use_slave_thumb"),
("PoseTemplateSettings", "generate_def_rig", "use_generate_deform_rig"),
("Armature", "drawtype", "draw_type"),
("Armature", "layer_protection", "layers_protected"),
("Armature", "auto_ik", "use_auto_ik"),
@@ -685,7 +669,6 @@ data_path_update = [
("TextureNodeMixRGB", "alpha", "use_alpha"),
("TextureSlot", "negate", "invert"),
("TextureSlot", "size", "scale"),
("VertexPaint", "normals", "use_normal"),
("SoftBodySettings", "damp", "damping"),
("SequenceCrop", "right", "max_x"),
("SequenceCrop", "top", "max_y"),

2
release/scripts/ui/space_view3d_toolbar.py
View File

@@ -1117,7 +1117,7 @@ class VIEW3D_PT_tools_weightpaint_options(View3DPanel, bpy.types.Panel):
col = layout.column()
col.prop(wpaint, "use_all_faces")
col.prop(wpaint, "normals")
col.prop(wpaint, "use_normal")
col.prop(wpaint, "use_spray")
obj = context.weight_paint_object

6
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@@ -95,7 +95,7 @@ int vertex_paint_mode_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
return ob && ob->mode == OB_MODE_VERTEX_PAINT;
return ob && ob->mode == OB_MODE_VERTEX_PAINT && ((Mesh *)ob->data)->totface;
}
int vertex_paint_poll(bContext *C)
@@ -107,8 +107,8 @@ int vertex_paint_poll(bContext *C)
ARegion *ar= CTX_wm_region(C);
if(ar->regiontype==RGN_TYPE_WINDOW)
return 1;
}
}
}
return 0;
}
@@ -116,7 +116,7 @@ int weight_paint_mode_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
return ob && ob->mode == OB_MODE_WEIGHT_PAINT;
return ob && ob->mode == OB_MODE_WEIGHT_PAINT && ((Mesh *)ob->data)->totface;
}
int weight_paint_poll(bContext *C)