diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 00:03:21 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 00:03:21 +0300 |
| commit | 05517c9bedfdd6afbae0a7d99dbbaba54563303b (patch) | |
| tree | 8227f5feb22217e7278a65f4b6c1d1f0b7a29eeb /source/blender/editors/space_view3d/space_view3d.c | |
| parent | ff11750ee9925d2c75193e1e7cbaccec86855fa8 (diff) | |
| parent | 07e368cb5f6a4f73164a70794e884970d171d909 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcachetemp-eeveelightcache
# Conflicts:
# source/blender/draw/engines/eevee/eevee_lightprobes.c
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 7495733382c..9aaced3e583 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1065,11 +1065,11 @@ static void view3d_main_region_message_subscribe( &RNA_Window, /* These object have properties that impact drawing. */ - &RNA_AreaLamp, + &RNA_AreaLight, &RNA_Camera, - &RNA_Lamp, + &RNA_Light, &RNA_Speaker, - &RNA_SunLamp, + &RNA_SunLight, /* General types the 3D view depends on. */ &RNA_Object, |