[Bf-blender-cvs] [37ee4d4e2a0] functions: Merge branch 'master' into functions

Jacques Lucke noreply at git.blender.org
Sat Mar 21 12:14:25 CET 2020


Commit: 37ee4d4e2a0afb403f6f3a4a5898d2cfe2a339c7
Author: Jacques Lucke
Date:   Sat Mar 21 12:09:13 2020 +0100
Branches: functions
https://developer.blender.org/rB37ee4d4e2a0afb403f6f3a4a5898d2cfe2a339c7

Merge branch 'master' into functions

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index d18f53ec3fc,1e230e5af3a..7634cd082fb
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -124,11 -124,8 +125,10 @@@ set(SR
    intern/hair.c
    intern/icons.c
    intern/icons_rasterize.c
-   intern/idcode.c
    intern/idprop.c
    intern/idprop_utils.c
 +  intern/id_data_cache.cc
 +  intern/id_handle.cc
    intern/idtype.c
    intern/image.c
    intern/image_gen.c
@@@ -307,10 -303,7 +308,9 @@@
    BKE_gpencil_modifier.h
    BKE_hair.h
    BKE_icons.h
-   BKE_idcode.h
    BKE_idprop.h
 +  BKE_id_data_cache.h
 +  BKE_id_handle.h
    BKE_idtype.h
    BKE_image.h
    BKE_ipo.h



More information about the Bf-blender-cvs mailing list