Update for renaming lamp to light.

6 files changed, 16 insertions, 16 deletions

diff --git a/add_advanced_objects_menu/__init__.py b/add_advanced_objects_menu/__init__.py
index 42a33445..e0388bf7 100644
--- a/add_advanced_objects_menu/__init__.py
+++ b/add_advanced_objects_menu/__init__.py
@@ -108,8 +108,8 @@ class INFO_MT_scene_elements_add(Menu):
 
 
 # Define the "Lights" menu
-class INFO_MT_mesh_lamps_add(Menu):
-    bl_idname = "INFO_MT_scene_lamps"
+class INFO_MT_mesh_lights_add(Menu):
+    bl_idname = "INFO_MT_scene_lights"
     bl_label = "Lighting Sets"
 
     def draw(self, context):
@@ -191,7 +191,7 @@ def menu(self, context):
     layout.operator_context = 'INVOKE_REGION_WIN'
     self.layout.separator()
     self.layout.menu("INFO_MT_scene_elements", icon="SCENE_DATA")
-    self.layout.menu("INFO_MT_scene_lamps", icon="LAMP_SPOT")
+    self.layout.menu("INFO_MT_scene_lights", icon="LIGHT_SPOT")
     self.layout.separator()
     self.layout.menu("INFO_MT_array_mods", icon="MOD_ARRAY")
     self.layout.menu("INFO_MT_quick_tools", icon="MOD_BUILD")
diff --git a/add_advanced_objects_menu/add_light_template.py b/add_advanced_objects_menu/add_light_template.py
index 9e2c139f..5b4fbc86 100644
--- a/add_advanced_objects_menu/add_light_template.py
+++ b/add_advanced_objects_menu/add_light_template.py
@@ -5,10 +5,10 @@ from bpy.types import Operator
 from bpy.props import BoolProperty
 
 
-def add_lamps(self, context):
+def add_lights(self, context):
 
     if self.bKeyLight:
-        keyLight = bpy.data.lamps.new(name="Key_Light", type="SPOT")
+        keyLight = bpy.data.lights.new(name="Key_Light", type="SPOT")
         ob = bpy.data.objects.new("Key_Light", keyLight)
         constraint = ob.constraints.new(type='COPY_LOCATION')
         constraint.use_offset = True
@@ -23,7 +23,7 @@ def add_lamps(self, context):
         ob.rotation_euler[2] = -0.785398
 
     if self.bFillLight:
-        fillLight = bpy.data.lamps.new(name="Fill_Light", type="SPOT")
+        fillLight = bpy.data.lights.new(name="Fill_Light", type="SPOT")
         ob = bpy.data.objects.new("Fill_Light", fillLight)
         constraint = ob.constraints.new(type='COPY_LOCATION')
         constraint.use_offset = True
@@ -39,7 +39,7 @@ def add_lamps(self, context):
         ob.data.energy = 0.3
 
     if self.bBackLight:
-        backLight = bpy.data.lamps.new(name="Back_Light", type="SPOT")
+        backLight = bpy.data.lights.new(name="Back_Light", type="SPOT")
         ob = bpy.data.objects.new("Back_Light", backLight)
         constraint = ob.constraints.new(type='COPY_LOCATION')
         constraint.use_offset = True
@@ -121,7 +121,7 @@ class OBJECT_OT_add_light_template(Operator):
                 self.target = context.active_object
                 self.camera = context.scene.camera
 
-            add_lamps(self, context)
+            add_lights(self, context)
 
         except Exception as e:
             self.report({'WARNING'},
diff --git a/add_advanced_objects_menu/copy2.py b/add_advanced_objects_menu/copy2.py
index 489f6dee..9a94ac1d 100644
--- a/add_advanced_objects_menu/copy2.py
+++ b/add_advanced_objects_menu/copy2.py
@@ -168,7 +168,7 @@ def copy_to_from(scene, to_obj, from_obj, copymode, axes, edgescale, scale):
 
     if copymode == 'E':
         # don't pass edgescalling to object types that cannot be scaled
-        if from_obj.type in ["CAMERA", "LAMP", "EMPTY", "ARMATURE", "SPEAKER", "META"]:
+        if from_obj.type in ["CAMERA", "LIGHT", "EMPTY", "ARMATURE", "SPEAKER", "META"]:
             edgescale = False
         edge_copy(scene, to_obj, from_obj, axes, edgescale, scale)
 
diff --git a/add_advanced_objects_menu/scene_objects_bi.py b/add_advanced_objects_menu/scene_objects_bi.py
index f189bb11..f8afd906 100644
--- a/add_advanced_objects_menu/scene_objects_bi.py
+++ b/add_advanced_objects_menu/scene_objects_bi.py
@@ -47,7 +47,7 @@ class add_BI_scene(Operator):
             bpy.ops.view3d.viewnumpad(type='CAMERA')
 
             # add point lamp
-            bpy.ops.object.lamp_add(
+            bpy.ops.object.light_add(
                     type="POINT", location=(4.07625, 1.00545, 5.90386),
                     rotation=(0.650328, 0.055217, 1.866391)
                     )
@@ -59,7 +59,7 @@ class add_BI_scene(Operator):
             lamp1.use_sphere = True
 
             # add point lamp2
-            bpy.ops.object.lamp_add(
+            bpy.ops.object.light_add(
                     type="POINT", location=(-0.57101, -4.24586, 5.53674),
                     rotation=(1.571, 0, 0.785)
                     )
diff --git a/add_advanced_objects_menu/scene_objects_cycles.py b/add_advanced_objects_menu/scene_objects_cycles.py
index 85e85867..b6831791 100644
--- a/add_advanced_objects_menu/scene_objects_cycles.py
+++ b/add_advanced_objects_menu/scene_objects_cycles.py
@@ -47,7 +47,7 @@ class add_cycles_scene(Operator):
             bpy.ops.view3d.viewnumpad(type='CAMERA')
 
             # add point lamp
-            bpy.ops.object.lamp_add(
+            bpy.ops.object.light_add(
                     type="POINT", location=(4.07625, 1.00545, 5.90386),
                     rotation=(0.650328, 0.055217, 1.866391)
                     )
@@ -59,7 +59,7 @@ class add_cycles_scene(Operator):
             lamp1.use_sphere = True
 
             # add point lamp2
-            bpy.ops.object.lamp_add(
+            bpy.ops.object.light_add(
                     type="POINT", location=(-0.57101, -4.24586, 5.53674),
                     rotation=(1.571, 0, 0.785)
                     )
diff --git a/add_advanced_objects_menu/trilighting.py b/add_advanced_objects_menu/trilighting.py
index e0068e66..c163a894 100644
--- a/add_advanced_objects_menu/trilighting.py
+++ b/add_advanced_objects_menu/trilighting.py
@@ -173,7 +173,7 @@ class TriLighting(Operator):
             backx = obj_position.x + self.distance * singleback_vector.x
             backy = obj_position.y + self.distance * singleback_vector.y
 
-            backData = bpy.data.lamps.new(name="TriLamp-Back", type=self.secondarytype)
+            backData = bpy.data.lights.new(name="TriLamp-Back", type=self.secondarytype)
             backData.energy = backEnergy
 
             backLamp = bpy.data.objects.new(name="TriLamp-Back", object_data=backData)
@@ -196,7 +196,7 @@ class TriLighting(Operator):
             rightx = obj_position.x + self.distance * singleright_vector.x
             righty = obj_position.y + self.distance * singleright_vector.y
 
-            rightData = bpy.data.lamps.new(name="TriLamp-Fill", type=self.secondarytype)
+            rightData = bpy.data.lights.new(name="TriLamp-Fill", type=self.secondarytype)
             rightData.energy = fillEnergy
             rightLamp = bpy.data.objects.new(name="TriLamp-Fill", object_data=rightData)
             scene.objects.link(rightLamp)
@@ -215,7 +215,7 @@ class TriLighting(Operator):
             leftx = obj_position.x + self.distance * singleleft_vector.x
             lefty = obj_position.y + self.distance * singleleft_vector.y
 
-            leftData = bpy.data.lamps.new(name="TriLamp-Key", type=self.primarytype)
+            leftData = bpy.data.lights.new(name="TriLamp-Key", type=self.primarytype)
             leftData.energy = keyEnergy
 
             leftLamp = bpy.data.objects.new(name="TriLamp-Key", object_data=leftData)