Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Feb 2018 02:10:39 +0000 (13:10 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Feb 2018 02:10:39 +0000 (13:10 +1100)
1  2 
source/blender/blenkernel/BKE_modifier.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/windowmanager/intern/wm_event_system.c

index ac9c2c50df2f72d63fc63773ff54a18c2ed27d89,b0917e4f6cdc40494554dec6728a998e216cd48e..e1ce58ba69ba94d358b1d7cc442e16d08843615c
@@@ -271,9 -284,10 +271,9 @@@ typedef struct ModifierTypeInfo 
         *
         * This function is optional.
         */
 -      /* TODO(sergey): Remove once we finally switched to the new depsgraph. */
        void (*updateDepsgraph)(struct ModifierData *md,
-                               const ModifierUpdateDepsgraphContext* ctx);
+                               const ModifierUpdateDepsgraphContext *ctx);
 -
++ 
        /* Should return true if the modifier needs to be recalculated on time
         * changes.
         *