[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25860] trunk/blender: bugfix [#20627] Sculting - Mesh without faces crashes
Campbell Barton
ideasman42 at gmail.com
Sun Jan 10 11:20:44 CET 2010
Revision: 25860
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25860
Author: campbellbarton
Date: 2010-01-10 11:20:44 +0100 (Sun, 10 Jan 2010)
Log Message:
-----------
bugfix [#20627] Sculting - Mesh without faces crashes
fix own error in py ui also
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenlib/intern/pbvh.c
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-01-10 09:11:48 UTC (rev 25859)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-01-10 10:20:44 UTC (rev 25860)
@@ -803,8 +803,9 @@
col.prop(wpaint, "normals")
col.prop(wpaint, "spray")
- if context.weight_paint_object.type == 'MESH':
- col.prop(data, "use_mirror_x")
+ obj = context.weight_paint_object
+ if obj.type == 'MESH':
+ col.prop(obj.data, "use_mirror_x")
# Commented out because the Apply button isn't an operator yet, making these settings useless
# col.label(text="Gamma:")
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-01-10 09:11:48 UTC (rev 25859)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-01-10 10:20:44 UTC (rev 25860)
@@ -633,6 +633,10 @@
/* pop node */
iter->stacksize--;
node= iter->stack[iter->stacksize].node;
+
+ if(node==NULL)
+ return NULL;
+
revisiting= iter->stack[iter->stacksize].revisiting;
/* revisiting node already checked */
More information about the Bf-blender-cvs
mailing list