[Bf-blender-cvs] [39ac621c2a2] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Sat Apr 14 16:25:48 CEST 2018
Commit: 39ac621c2a251a3d1d29feef56f43714770a9313
Author: Antonio Vazquez
Date: Sat Apr 14 16:11:12 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB39ac621c2a251a3d1d29feef56f43714770a9313
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/blenkernel/intern/object.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_object.h
index 44b15db48f6,c698db2e8f5..4d816c00af8
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -73,9 -71,8 +73,9 @@@ void BKE_object_free_derived_caches(str
void BKE_object_free_caches(struct Object *object);
void BKE_object_modifier_hook_reset(struct Object *ob, struct HookModifierData *hmd);
+void BKE_object_modifier_gpencil_hook_reset(struct Object *ob, struct GpencilHookModifierData *hmd);
- bool BKE_object_support_modifier_type_check(struct Object *ob, int modifier_type);
+ bool BKE_object_support_modifier_type_check(const struct Object *ob, int modifier_type);
void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_src);
void BKE_object_free_modifiers(struct Object *ob, const int flag);
More information about the Bf-blender-cvs
mailing list