diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b1661e9a0eb..208bcaab007 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -835,7 +835,7 @@ static void rna_Scene_set_set(PointerRNA *ptr, void rna_Scene_set_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; DEG_relations_tag_update(bmain); DEG_id_tag_update_ex(bmain, &scene->id, 0); @@ -873,7 +873,7 @@ static void rna_Scene_listener_update(Main *UNUSED(bmain), Scene *scene, Pointer static void rna_Scene_volume_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; DEG_id_tag_update(&scene->id, ID_RECALC_AUDIO_VOLUME | ID_RECALC_SEQUENCER_STRIPS); } @@ -997,7 +997,7 @@ static void rna_Scene_show_subframe_update(Main *UNUSED(bmain), Scene *UNUSED(current_scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; scene->r.subframe = 0.0f; } @@ -1005,7 +1005,7 @@ static void rna_Scene_frame_update(Main *UNUSED(bmain), Scene *UNUSED(current_scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; DEG_id_tag_update(&scene->id, ID_RECALC_AUDIO_SEEK); WM_main_add_notifier(NC_SCENE | ND_FRAME, scene); } @@ -1118,7 +1118,7 @@ static char *rna_BakeSettings_path(PointerRNA *UNUSED(ptr)) static char *rna_ImageFormatSettings_path(PointerRNA *ptr) { ImageFormatData *imf = (ImageFormatData *)ptr->data; - ID *id = ptr->id.data; + ID *id = ptr->owner_id; switch (GS(id->name)) { case ID_SCE: { @@ -1189,7 +1189,7 @@ static bool rna_RenderSettings_is_movie_format_get(PointerRNA *ptr) static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) { ImageFormatData *imf = (ImageFormatData *)ptr->data; - ID *id = ptr->id.data; + ID *id = ptr->owner_id; imf->imtype = value; const bool is_render = (id && GS(id->name) == ID_SCE); @@ -1230,7 +1230,7 @@ static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) } if (id && GS(id->name) == ID_SCE) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; RenderData *rd = &scene->r; # ifdef WITH_FFMPEG BKE_ffmpeg_image_type_verify(rd, imf); @@ -1244,7 +1244,7 @@ static const EnumPropertyItem *rna_ImageFormatSettings_file_format_itemf(bContex PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { - ID *id = ptr->id.data; + ID *id = ptr->owner_id; if (id && GS(id->name) == ID_SCE) { return rna_enum_image_type_items; } @@ -1259,7 +1259,7 @@ static const EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext bool *r_free) { ImageFormatData *imf = (ImageFormatData *)ptr->data; - ID *id = ptr->id.data; + ID *id = ptr->owner_id; const bool is_render = (id && GS(id->name) == ID_SCE); /* note, we need to act differently for render @@ -1275,7 +1275,7 @@ static const EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext * the same MPEG format with QTRLE codec can easily handle alpha channel. * not sure how to deal with such cases in a nicer way (sergey) */ if (is_render) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; RenderData *rd = &scene->r; if (BKE_ffmpeg_alpha_channel_is_supported(rd)) { @@ -1444,7 +1444,7 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str) # ifdef WITH_FFMPEG static void rna_FFmpegSettings_lossless_output_set(PointerRNA *ptr, bool value) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; RenderData *rd = &scene->r; if (value) { @@ -1461,7 +1461,7 @@ static void rna_FFmpegSettings_codec_settings_update(Main *UNUSED(bmain), Scene *UNUSED(scene_unused), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; RenderData *rd = &scene->r; BKE_ffmpeg_codec_settings_verify(rd); @@ -1560,7 +1560,7 @@ static void rna_RenderSettings_engine_set(PointerRNA *ptr, int value) if (type) { BLI_strncpy_utf8(rd->engine, type->idname, sizeof(rd->engine)); - DEG_id_tag_update(ptr->id.data, ID_RECALC_COPY_ON_WRITE); + DEG_id_tag_update(ptr->owner_id, ID_RECALC_COPY_ON_WRITE); } } @@ -1616,20 +1616,20 @@ static bool rna_RenderSettings_multiple_engines_get(PointerRNA *UNUSED(ptr)) static bool rna_RenderSettings_use_spherical_stereo_get(PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; return BKE_scene_use_spherical_stereo(scene); } void rna_Scene_glsl_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; DEG_id_tag_update(&scene->id, 0); } static void rna_Scene_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - Scene *sc = (Scene *)ptr->id.data; + Scene *sc = (Scene *)ptr->owner_id; rna_Scene_glsl_update(bmain, scene, ptr); WM_main_add_notifier(NC_WORLD | ND_WORLD, &sc->id); @@ -1638,7 +1638,7 @@ static void rna_Scene_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) void rna_Scene_freestyle_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; DEG_id_tag_update(&scene->id, 0); } @@ -1654,7 +1654,7 @@ void rna_Scene_use_view_map_cache_update(Main *UNUSED(bmain), void rna_ViewLayer_name_set(PointerRNA *ptr, const char *value) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; ViewLayer *view_layer = (ViewLayer *)ptr->data; BLI_assert(BKE_id_is_in_global_main(&scene->id)); BKE_view_layer_rename(G_MAIN, scene, view_layer, value); @@ -1662,7 +1662,7 @@ void rna_ViewLayer_name_set(PointerRNA *ptr, const char *value) static void rna_SceneRenderView_name_set(PointerRNA *ptr, const char *value) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; SceneRenderView *rv = (SceneRenderView *)ptr->data; BLI_strncpy_utf8(rv->name, value, sizeof(rv->name)); BLI_uniquename(&scene->r.views, @@ -1675,14 +1675,14 @@ static void rna_SceneRenderView_name_set(PointerRNA *ptr, const char *value) void rna_ViewLayer_material_override_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; rna_Scene_glsl_update(bmain, scene, ptr); DEG_relations_tag_update(bmain); } void rna_ViewLayer_pass_update(Main *bmain, Scene *activescene, PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; if (scene->nodetree) { ntreeCompositUpdateRLayers(scene->nodetree); @@ -1715,7 +1715,7 @@ static void rna_Physics_relations_update(Main *bmain, static void rna_Physics_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; FOREACH_SCENE_OBJECT_BEGIN (scene, ob) { BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_DEPSGRAPH); } @@ -1802,7 +1802,7 @@ static void object_simplify_update(Object *ob) static void rna_Scene_use_simplify_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *sce = ptr->id.data; + Scene *sce = (Scene *)ptr->owner_id; Scene *sce_iter; Base *base; @@ -1823,7 +1823,7 @@ static void rna_Scene_use_simplify_update(Main *bmain, Scene *UNUSED(scene), Poi static void rna_Scene_simplify_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - Scene *sce = ptr->id.data; + Scene *sce = (Scene *)ptr->owner_id; if (sce->r.mode & R_SIMPLIFY) { rna_Scene_use_simplify_update(bmain, scene, ptr); @@ -1834,7 +1834,7 @@ static void rna_Scene_use_persistent_data_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *sce = ptr->id.data; + Scene *sce = (Scene *)ptr->owner_id; if (!(sce->r.mode & R_PERSISTENT_DATA)) { RE_FreePersistentData(); @@ -1845,7 +1845,7 @@ static void rna_Scene_use_persistent_data_update(Main *UNUSED(bmain), static void rna_Scene_transform_orientation_slots_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = &scene->orientation_slots[0]; rna_iterator_array_begin( iter, orient_slot, sizeof(*orient_slot), ARRAY_SIZE(scene->orientation_slots), 0, NULL); @@ -1853,7 +1853,7 @@ static void rna_Scene_transform_orientation_slots_begin(CollectionPropertyIterat static int rna_Scene_transform_orientation_slots_length(PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; return ARRAY_SIZE(scene->orientation_slots); } @@ -2101,7 +2101,7 @@ static void rna_Scene_update_active_object_data(bContext *C, PointerRNA *UNUSED( static void rna_SceneCamera_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; Object *camera = scene->camera; BKE_sequence_invalidate_scene_strips(bmain, scene); @@ -2242,7 +2242,7 @@ void rna_FreestyleSettings_module_remove(ID *id, static void rna_Stereo3dFormat_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - ID *id = ptr->id.data; + ID *id = ptr->owner_id; if (id && GS(id->name) == ID_IM) { Image *ima = (Image *)id; @@ -2290,7 +2290,7 @@ static void rna_ViewLayer_remove( static int rna_TransformOrientationSlot_type_get(PointerRNA *ptr) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = ptr->data; if (orient_slot != &scene->orientation_slots[SCE_ORIENT_DEFAULT]) { if ((orient_slot->flag & SELECT) == 0) { @@ -2302,7 +2302,7 @@ static int rna_TransformOrientationSlot_type_get(PointerRNA *ptr) void rna_TransformOrientationSlot_type_set(PointerRNA *ptr, int value) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = ptr->data; if (orient_slot != &scene->orientation_slots[SCE_ORIENT_DEFAULT]) { @@ -2320,7 +2320,7 @@ void rna_TransformOrientationSlot_type_set(PointerRNA *ptr, int value) static PointerRNA rna_TransformOrientationSlot_get(PointerRNA *ptr) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = ptr->data; TransformOrientation *orientation; if (orient_slot->type < V3D_ORIENT_CUSTOM) { @@ -2378,8 +2378,8 @@ const EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, bool *r_free) { Scene *scene; - if (ptr->id.data && (GS(((ID *)ptr->id.data)->name) == ID_SCE)) { - scene = ptr->id.data; + if (ptr->owner_id && (GS(ptr->owner_id->name) == ID_SCE)) { + scene = (Scene *)ptr->owner_id; } else { scene = CTX_data_scene(C); @@ -2392,7 +2392,7 @@ const EnumPropertyItem *rna_TransformOrientation_with_scene_itemf(bContext *UNUS PropertyRNA *UNUSED(prop), bool *r_free) { - Scene *scene = ptr->id.data; + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = ptr->data; bool include_default = (orient_slot != &scene->orientation_slots[SCE_ORIENT_DEFAULT]); return rna_TransformOrientation_impl_itemf(scene, include_default, r_free); @@ -5027,7 +5027,7 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna) /* use for render output and image save operator, * note: there are some cases where the members act differently when this is * used from a scene, video formats can only be selected for render output - * for example, this is checked by seeing if the ptr->id.data is a Scene id */ + * for example, this is checked by seeing if the ptr->owner_id is a Scene id */ static void rna_def_scene_image_format_data(BlenderRNA *brna) { |