Commit: 1079742db92576d79ec89a28d95336aff847a82a
Author: Campbell Barton
Date: Wed Feb 27 12:02:02 2019 +1100
Branches: master
https://developer.blender.org/rB1079742db92576d79ec89a28d95336aff847a82a
Cleanup: rename lamp -> light
===================================================================
M release/scripts/startup/bl_ui/space_node.py
M source/blender/blenkernel/BKE_lamp.h
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/lamp.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/studiolight.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/blentranslation/BLT_translation.h
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/DocumentImporter.h
M source/blender/collada/LightExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/collada/collada_utils.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/draw/engines/eevee/eevee_data.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
M source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
M source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
M source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
M
source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/shaders/common_globals_lib.glsl
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/resources.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_gizmo_lamp.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_material.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesdna/DNA_lamp_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/nodes/NOD_shader.h
M source/blender/nodes/shader/nodes/node_shader_output_lamp.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_node.py
b/release/scripts/startup/bl_ui/space_node.py
index c9930a66144..9ba496b0a44 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -59,7 +59,7 @@ class NODE_HT_header(Header):
NODE_MT_editor_menus.draw_collapsible(context, layout)
- # No shader nodes for Eevee lamps
+ # No shader nodes for Eevee lights
if snode_id and not (context.engine == 'BLENDER_EEVEE' and
ob.type == 'LIGHT'):
row = layout.row()
row.prop(snode_id, "use_nodes")
diff --git a/source/blender/blenkernel/BKE_lamp.h
b/source/blender/blenkernel/BKE_lamp.h
index 762f4eae46b..7625d5db9e4 100644
--- a/source/blender/blenkernel/BKE_lamp.h
+++ b/source/blender/blenkernel/BKE_lamp.h
@@ -22,7 +22,7 @@
/** \file
* \ingroup bke
- * \brief General operations, lookup, etc. for blender lamps.
+ * \brief General operations, lookup, etc. for blender lights.
*/
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/blenkernel/intern/anim_sys.c
b/source/blender/blenkernel/intern/anim_sys.c
index 446eb329910..3cbc81e887a 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1131,7 +1131,7 @@ void BKE_animdata_main_cb(Main *bmain,
ID_AnimData_Edit_Callback func, void *use
/* textures */
ANIMDATA_NODETREE_IDS_CB(bmain->tex.first, Tex);
- /* lamps */
+ /* lights */
ANIMDATA_NODETREE_IDS_CB(bmain->light.first, Light);
/* materials */
@@ -1230,7 +1230,7 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const
char *prefix, const cha
/* textures */
RENAMEFIX_ANIM_NODETREE_IDS(bmain->tex.first, Tex);
- /* lamps */
+ /* lights */
RENAMEFIX_ANIM_NODETREE_IDS(bmain->light.first, Light);
/* materials */
@@ -3612,7 +3612,7 @@ void BKE_animsys_evaluate_all_animation(Main *main,
Depsgraph *depsgraph, Scene
/* textures */
EVAL_ANIM_NODETREE_IDS(main->tex.first, Tex, ADT_RECALC_ANIM);
- /* lamps */
+ /* lights */
EVAL_ANIM_NODETREE_IDS(main->light.first, Light, ADT_RECALC_ANIM);
/* materials */
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index 8e27b3f288d..ce80aac5596 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -201,7 +201,7 @@ void BKE_camera_params_from_object(CameraParams *params,
const Object *ob)
params->clip_end = cam->clip_end;
}
else if (ob->type == OB_LAMP) {
- /* lamp object */
+ /* light object */
Light *la = ob->data;
params->lens = 16.0f / tanf(la->spotsize * 0.5f);
if (params->lens == 0.0f)
diff --git a/source/blender/blenkernel/intern/ipo.c
b/source/blender/blenkernel/intern/ipo.c
index b49debc36cc..1813edbafb4 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -615,7 +615,7 @@ static const char *camera_adrcodes_to_paths(int adrcode,
int *array_index)
}
/* Light Types */
-static const char *lamp_adrcodes_to_paths(int adrcode, int *array_index)
+static const char *light_adrcodes_to_paths(int adrcode, int *array_index)
{
/* set array index like this in-case nothing sets it correctly */
*array_index = 0;
@@ -842,8 +842,8 @@ static char *get_rna_access(ID *id, int blocktype, int
adrcode, char actname[],
propname = camera_adrcodes_to_paths(adrcode,
&dummy_index);
break;
- case ID_LA: /* lamp */
- propname = lamp_adrcodes_to_paths(adrcode,
&dummy_index);
+ case ID_LA: /* light */
+ propname = light_adrcodes_to_paths(adrcode,
&dummy_index);
break;
case ID_SO: /* sound */
@@ -1989,7 +1989,7 @@ void do_versions_ipos_to_animato(Main *bmain)
}
}
- /* lamps */
+ /* lights */
for (id = bmain->light.first; id; id = id->next) {
Light *la = (Light *)id;
diff --git a/source/blender/blenkernel/intern/lamp.c
b/source/blender/blenkernel/intern/lamp.c
index 5057daaa35d..318f5e7a046 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -165,7 +165,7 @@ void BKE_light_free(Light *la)
curvemapping_free(la->curfalloff);
- /* is no lib link block, but lamp extension */
+ /* is no lib link block, but light extension */
if (la->nodetree) {
ntreeFreeNestedTree(la->nodetree);
MEM_freeN(la->nodetree);
diff --git a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index f99a51c5d68..fdf0265c5f9 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -135,7 +135,7 @@ void BKE_material_init(Material *ma)
ma->roughness = 0.25f;
- ma->pr_lamp = 3; /* two lamps, is bits */
+ ma->pr_light = 3; /* two lights, is bits */
ma->pr_type = MA_SPHERE;
ma->preview = NULL;
diff --git a/source/blender/blenkernel/intern/node.c
b/source/blender/blenkernel/intern/node.c
index b8ccd0d9274..83c9697ae1e 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3550,7 +3550,7 @@ static void registerShaderNodes(void)
register_node_type_sh_uvalongstroke();
register_node_type_sh_eevee_specular();
- register_node_type_sh_output_lamp();
+ register_node_type_sh_output_light();
register_node_type_sh_output_material();
register_node_type_sh_output_world();
register_node_type_sh_output_linestyle();
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index 707daaf0c54..d7ff640bce8 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -715,10 +715,10 @@ void smokeModifier_copy(const struct SmokeModifierData
*smd, struct SmokeModifie
static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer
*view_layer);
static float calc_voxel_transp(float *result, float *input, int res[3], int
*pixel, float *tRay, float correct);
-static int get_lamp(ViewLayer *view_layer, float *light)
+static int get_light(ViewLayer *view_layer, float *light)
{
Base *base_tmp = NULL;
- int found_lamp = 0;
+ int found_light = 0;
// try to find a lamp, preferably local
for (base_tmp = FIRSTBASE(view_layer); base_tmp; base_tmp =
base_tmp->next) {
@@ -729,14 +729,14 @@ static int get_lamp(ViewLayer *view_layer, float *light)
copy_v3_v3(light, base_tmp->object->obmat[3]);
return 1;
}
- else if (!found_lamp) {
+ else if (!found_light) {
copy_v3_v3(light, base_tmp->object->obmat[3]);
- found_lamp = 1;
+ found_light = 1;
}
}
}
- return found_lamp;
+ return found_light;
}
/**********************************************************
@@ -3013,7 +3013,7 @@ static void smoke_calc_transparency(SmokeDomainSettings
*sds, ViewLayer *view_la
float *density = smoke_get_density(sds->fluid);
float correct = -7.0f * sds->dx;
- if (!get_lamp(view_layer, light)) return;
+ if (!get_light(view_layer, light)) return;
/* convert light pos to sim cell space */
mul_m4_v3(sds->imat, light);
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index 221ebbb6bc8..16bfee755f4 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -851,7 +851,7 @@ static float blinn_specular(
gloss *= 1.0f - wrap;
float shininess = exp2(10.0f * gloss + 1.0f);
- /* Pi is already divided in the lamp power.
+ /* Pi is already divided in the light power.
* normalization_factor = (shininess + 8.0) / (8.0 * M_PI) */
float normalization_factor = shininess * 0.125f + 1.0f;
float spec_light = powf(spec_angle, shininess) * max_ff(NL, 0.0f) *
normalization_factor;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 7370b17b4b4..74aadc00f93 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3973,7 +3973,7 @@ static void direct_link_camera(FileData *fd, Camera *ca)
/** \name Read ID: Light
* \{ */
-static void lib_link_lamp(FileData *fd, Main *main)
+static void lib_link_light(FileData *fd, Main *main)
{
for (Light *la = main->light.first; la; la = la->id.next) {
if (la->id.tag & LIB_TAG_NEED_LINK) {
@@ -3992,7 +3992,7 @@ static void lib_link_lamp(FileData *fd, Main *main)
}
}
-static void direct_link_lamp(FileData *fd, Light *la)
+static void direct_link_light(FileData *fd, Light *la)
{
la->adt = newdataadr(fd, la->adt);
direct_link_animdata(fd, la->adt);
@@ -9059,7 +9059,7 @@ static BHead *read_libblock(FileData *fd, Main *main,
BHead *bhead, const int ta
direct_link_image(fd, (Image *)id);
break;
case ID_LA:
- direct_link_lamp(fd, (Light *)id);
+ direct_link_light(fd, (Light *)id);
break;
case ID_VF:
direct_link_vfont(fd, (VFont *)id);
@@ -9323,7 +9323,7 @@ static void lib_link_all(FileData *fd, Main *main)
lib_link_ipo(fd, main); /* XXX deprecated... still needs to be
maintained for version patches still */
lib_link_key(fd, main);
lib_link_world(fd, main);
- lib_link_lamp(fd, main);
+ lib_link_light(fd, main);
lib_link_latt(fd, main);
lib_link_text(fd, main);
lib_link_camera(fd, main);
@@ -10126,7 +10126,7 @@ static void expand_material(FileData *fd, Main
*mainvar, Material *ma)
}
}
-static void expand_lamp(FileData *fd, Main *mainvar, Light *la)
+static void expand_light(FileData *fd, Main *mainvar, Light *la)
{
expand_doit(fd, mainvar, la->ipo); // XXX deprecated - old animation
system
@@ -10692,7 +10692,7 @@ void BLO_expand_main(void *fdhandle, Main *mainvar)
expand_lattice(fd,
mainvar, (Lattice *)id);
break;
case ID_LA:
- expand_lamp(fd,
mainvar, (Light *)id);
+ expand_light(fd,
mainvar, (Light *)id);
break;
case ID_KE:
expand_key(fd, mainvar,
(Key *)id);
diff --git a/source/blender/blenloader/intern/versioning_250.c
b/source/blender/blenloader/intern/versioning_250.c
index 6b75203cd31..1a92a75af09 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
