- fix for crash with constraint UI when using with a pinner object, with None active.

- fix for material UI when the pinned data was not a material.
- fix an error axis-angle drot label.

2 files changed, 9 insertions, 4 deletions

diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py
index 40a1edafe87..6390f13b668 100644
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/ui/properties_object.py
@@ -88,7 +88,7 @@ class OBJECT_PT_delta_transform(ObjectButtonsPanel, bpy.types.Panel):
             #row.column().prop(pchan, "delta_rotation_angle", text="Angle")
             #row.column().prop(pchan, "delta_rotation_axis", text="Axis")
             #row.column().prop(ob, "delta_rotation_axis_angle", text="Rotation")
-            row.column().label(ob, text="Not for Axis-Angle")
+            row.column().label(text="Not for Axis-Angle")
         else:
             row.column().prop(ob, "delta_rotation_euler", text="Rotation")
 
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index f106902cb81..32736b78b76 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -94,11 +94,16 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel):
         space = context.space_data
         tex = context.texture
         idblock = context_tex_datablock(context)
-        tex_collection = space.pin_id is None and type(idblock) != bpy.types.Brush and not node
+        pin_id = space.pin_id
+
+        if type(pin_id) != bpy.types.Material:
+            pin_id = None
+
+        tex_collection = pin_id is None and type(idblock) != bpy.types.Brush and not node
 
         if tex_collection:
             row = layout.row()
-
+            
             row.template_list(idblock, "texture_slots", idblock, "active_texture_index", rows=2)
 
             col = row.column(align=True)
@@ -116,7 +121,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel):
         elif idblock:
             col.template_ID(idblock, "texture", new="texture.new")
 
-        if space.pin_id:
+        if pin_id:
             col.template_ID(space, "pin_id")
 
         col = split.column()