[Bf-blender-cvs] [17cb55e] master: Fix warning from previous commit:
Antony Riakiotakis
noreply at git.blender.org
Wed Jan 28 15:24:56 CET 2015
Commit: 17cb55e4427a681fc9a2c17bf8437ce811b852df
Author: Antony Riakiotakis
Date: Wed Jan 28 15:24:21 2015 +0100
Branches: master
https://developer.blender.org/rB17cb55e4427a681fc9a2c17bf8437ce811b852df
Fix warning from previous commit:
Set slot to NULL when no active slot is found.
===================================================================
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 774d21e..9879ba8 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1126,6 +1126,8 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
if mat.texture_paint_slots:
slot = mat.texture_paint_slots[mat.paint_active_slot]
+ else:
+ slot = None
if (not mat.use_nodes) and context.scene.render.engine in {'BLENDER_RENDER', 'BLENDER_GAME'}:
row = col.row(align=True)
More information about the Bf-blender-cvs
mailing list