diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-17 19:13:10 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-17 19:13:10 +0300 |
| commit | 60cd996c0aa1291c514c3a38625e6657a28230f7 (patch) | |
| tree | d83ec92d5ebe6c5ca0de644460cc5fa2c6966c97 /source/blender/blenkernel | |
| parent | 970a7c8bb9c6c7d6dd309e6a8991cb13389fcfa0 (diff) | |
Silence warnings in Mac (based on buildbot build report)
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ff29affd6d9..007499614c2 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -313,11 +313,12 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* recursively creates a new SceneCollection tree */ scene_collection_copy(mcn, mc); + IDPropertyTemplate val = {0}; BLI_duplicatelist(&scen->render_layers, &sce->render_layers); SceneLayer *new_sl = scen->render_layers.first; for (SceneLayer *sl = sce->render_layers.first; sl; sl = sl->next) { new_sl->stats = NULL; - new_sl->properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); new_sl->properties_evaluated = NULL; /* we start fresh with no overrides and no visibility flags set @@ -339,8 +340,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) new_sl = new_sl->next; } - scen->collection_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); - scen->layer_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + scen->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + scen->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); } /* copy color management settings */ @@ -959,10 +960,11 @@ void BKE_scene_init(Scene *sce) BLI_strncpy(sce->collection->name, "Master Collection", sizeof(sce->collection->name)); /* Engine settings */ - sce->collection_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + IDPropertyTemplate val = {0}; + sce->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); BKE_layer_collection_engine_settings_create(sce->collection_properties); - sce->layer_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + sce->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); BKE_scene_layer_engine_settings_create(sce->layer_properties); BKE_scene_layer_add(sce, "Render Layer"); |