[Bf-blender-cvs] [2dad5a97544] master: Fix: Displace Modifier UV Layer UI not a pointer

[Cody Winchester]

Commit: 2dad5a97544f06a90a2e98e5df5c110e7c56c638
Author: Cody Winchester
Date:   Thu Jun 25 11:57:06 2020 -0400
Branches: master
https://developer.blender.org/rB2dad5a97544f06a90a2e98e5df5c110e7c56c638

Fix: Displace Modifier UV Layer UI not a pointer

The displace modifier's uv_layer property should be a pointer in the new
UI like the other modifiers use.

Differential Revision: https://developer.blender.org/D7990

===================================================================

M	source/blender/modifiers/intern/MOD_displace.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 32e36fbd09e..894a48d9f62 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -440,6 +440,8 @@ static void panel_draw(const bContext *C, Panel *panel)
   PointerRNA ob_ptr;
   modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
 
+  PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data");
+
   PointerRNA texture_ptr = RNA_pointer_get(&ptr, "texture");
   bool has_texture = !RNA_pointer_is_null(&texture_ptr);
   int texture_coords = RNA_enum_get(&ptr, "texture_coords");
@@ -467,7 +469,7 @@ static void panel_draw(const bContext *C, Panel *panel)
     }
   }
   else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) {
-    uiItemR(col, &ptr, "uv_layer", 0, NULL, ICON_NONE);
+    uiItemPointerR(col, &ptr, "uv_layer", &obj_data_ptr, "uv_layers", NULL, ICON_NONE);
   }
 
   uiItemS(layout);