diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-18 12:58:21 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-18 12:58:21 +0400 |
commit | 4df0c46f838f7c316b10a6667705c093f067cadd (patch) | |
tree | 9620cb8dbe215e30a3738509bed50408bca2452d /source/blender/blenkernel/BKE_object.h | |
parent | 093f95afaa4a08d2cf194b88803a35ef16cfec58 (diff) |
Make freestyle use local Main for temporary objects
This means main database is no longer pollutes with
temporary scene and objects needed for freestyle
render.
Actually, there're few of separated temporary mains
now. Ideally it's better to use single one, but it's
not so much trivial to pass it to all classes. Not
so big deal actually.
Required some changes to blender kernel, to make it
possible to add object to a given main, also to
check on mesh materials for objects in given main.
This is all straightforward changes.
As an additional, solved issue with main database
being infinitely polluted with text blocks created
by create_lineset_handler function.
This fixes:
- #35003: Freestyle crashes if user expands objects in FRS1_Scene
- #35012: ctrl+f12 rendering crashes when using Freestyle
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index da5fa3e8195..8870355a919 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -81,8 +81,8 @@ bool BKE_object_exists_check(struct Object *obtest); bool BKE_object_is_in_editmode(struct Object *ob); struct Object *BKE_object_add_only_object(struct Main *bmain, int type, const char *name); -struct Object *BKE_object_add(struct Scene *scene, int type); -void *BKE_object_obdata_add_from_type(int type); +struct Object *BKE_object_add(struct Main *bmain, struct Scene *scene, int type); +void *BKE_object_obdata_add_from_type(struct Main *bmain, int type); struct Object *BKE_object_copy_ex(struct Main *bmain, struct Object *ob, int copy_caches); struct Object *BKE_object_copy(struct Object *ob); |