[Bf-blender-cvs] [81b9187dda1] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 81b9187dda14bcca848945cad198c2d297ae0c18
Author: Jacques Lucke
Date:   Wed Apr 24 09:22:11 2019 +0200
Branches: functions
https://developer.blender.org/rB81b9187dda14bcca848945cad198c2d297ae0c18

Merge branch 'master' into functions

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py
index ab6a8488754,668dd61315d..024d41a1e51
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@@ -386,12 -386,10 +386,12 @@@ class DATA_PT_modifiers(ModifierButtons
          row.prop(md, "mid_level")
          row.prop(md, "strength")
  
 -    def DYNAMIC_PAINT(self, layout, _ob, _md):
 +        layout.prop(md, "function_tree", text="Weight Function")
 +
-     def DYNAMIC_PAINT(self, layout, ob, md):
++    def DYNAMIC_PAINT(self, layout, _ob, md):
          layout.label(text="Settings are inside the Physics tab")
  
-     def EDGE_SPLIT(self, layout, ob, md):
+     def EDGE_SPLIT(self, layout, _ob, md):
          split = layout.split()
  
          col = split.column()
diff --cc source/blender/blenkernel/CMakeLists.txt
index 14a0071f9b3,e564e91749c..7323457a6aa
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -24,9 -24,10 +24,11 @@@ set(IN
    ../blenlib
    ../blenloader
    ../blentranslation
+   ../bmesh
    ../depsgraph
    ../draw
 +  ../functions
+   ../gpencil_modifiers
    ../gpu
    ../ikplugin
    ../imbuf
diff --cc source/blender/blenkernel/intern/fcurve.c
index 32c92ec5b55,f4ac586d9c4..c2d68e34693
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@@ -1827,12 -1849,9 +1892,13 @@@ void driver_change_variable_type(Driver
      dtar->flag = flags;
  
      /* object ID types only, or idtype not yet initialized */
-     if ((flags & DTAR_FLAG_ID_OB_ONLY) || (dtar->idtype == 0))
+     if ((flags & DTAR_FLAG_ID_OB_ONLY) || (dtar->idtype == 0)) {
        dtar->idtype = ID_OB;
+     }
 +
 +    if (type == DVAR_TYPE_FUNCTION) {
 +      dtar->idtype = ID_NT;
 +    }
    }
    DRIVER_TARGETS_LOOPER_END;
  }
diff --cc source/blender/modifiers/CMakeLists.txt
index b7408355bc2,5116fefde94..2a1e46d6505
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@@ -21,18 -21,17 +21,18 @@@
  set(INC
    .
    intern
+   ../blenfont
    ../blenkernel
    ../blenlib
-   ../blenfont
+   ../bmesh
    ../depsgraph
++  ../functions
    ../makesdna
    ../makesrna
-   ../bmesh
-   ../functions
    ../render/extern/include
    ../../../intern/elbeem/extern
-   ../../../intern/guardedalloc
    ../../../intern/eigen
+   ../../../intern/guardedalloc
  )
  
  set(INC_SYS
diff --cc source/creator/CMakeLists.txt
index 8f7c1944862,0f7612abb0c..cad016a5ef2
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@@ -29,12 -29,11 +29,12 @@@ blender_include_dirs
    ../blender/blenloader
    ../blender/depsgraph
    ../blender/editors/include
 +  ../blender/functions
-   ../blender/makesrna
    ../blender/imbuf
+   ../blender/makesrna
    ../blender/render/extern/include
-   ../blender/makesdna
    ../blender/gpu
+   ../blender/makesdna
    ../blender/windowmanager
  )