1 files changed, 25 insertions, 5 deletions
diff --git a/release/scripts/ui/properties_data_camera.py b/release/scripts/ui/properties_data_camera.py
index d2889b6629e..be0a4f84145 100644
--- a/release/scripts/ui/properties_data_camera.py
+++ b/release/scripts/ui/properties_data_camera.py
@@ -12,7 +12,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
 
@@ -116,6 +116,10 @@ class DATA_PT_camera(DataButtonsPanel):
 
         if wide_ui:
             col = split.column()
+        else:
+            col = col.column()
+        if cam.dof_object != None:
+            col.enabled = False
         col.prop(cam, "dof_distance", text="Distance")
 
 
@@ -146,8 +150,24 @@ class DATA_PT_camera_display(DataButtonsPanel):
         sub.prop(cam, "passepartout_alpha", text="Alpha", slider=True)
 
 
-bpy.types.register(DATA_PT_context_camera)
-bpy.types.register(DATA_PT_camera)
-bpy.types.register(DATA_PT_camera_display)
+classes = [
+    DATA_PT_context_camera,
+    DATA_PT_camera,
+    DATA_PT_camera_display,
+
+    DATA_PT_custom_props_camera]
+
+
+def register():
+    register = bpy.types.register
+    for cls in classes:
+        register(cls)
+
+
+def unregister():
+    unregister = bpy.types.unregister
+    for cls in classes:
+        unregister(cls)
 
-bpy.types.register(DATA_PT_custom_props_camera)
+if __name__ == "__main__":
+    register()