diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 158 |
1 files changed, 79 insertions, 79 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 0a4016f3d4a..e43fe912fc3 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -299,27 +299,27 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - DEG_id_tag_update(ptr->id.data, ID_RECALC_TRANSFORM); + DEG_id_tag_update(ptr->owner_id, ID_RECALC_TRANSFORM); } static void rna_Object_internal_update_draw(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - DEG_id_tag_update(ptr->id.data, ID_RECALC_TRANSFORM); - WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data); + DEG_id_tag_update(ptr->owner_id, ID_RECALC_TRANSFORM); + WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->owner_id); } static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) { /* don't use compat so we get predictable rotation */ - BKE_object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, false, true); + BKE_object_apply_mat4((Object *)ptr->owner_id, ((Object *)ptr->owner_id)->obmat, false, true); rna_Object_internal_update(bmain, scene, ptr); } static void rna_Object_hide_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BKE_main_collection_sync_remap(bmain); DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE); DEG_relations_tag_update(bmain); @@ -328,7 +328,7 @@ static void rna_Object_hide_update(Main *bmain, Scene *UNUSED(scene), PointerRNA static void rna_MaterialIndex_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; if (ob && ob->type == OB_GPENCIL) { /* notifying material property in topbar */ WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -337,13 +337,13 @@ static void rna_MaterialIndex_update(Main *UNUSED(bmain), Scene *UNUSED(scene), static void rna_Object_matrix_local_get(PointerRNA *ptr, float values[16]) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BKE_object_matrix_local_get(ob, (float(*)[4])values); } static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; float local_mat[4][4]; /* Localspace matrix is truly relative to the parent, @@ -365,20 +365,20 @@ static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) static void rna_Object_matrix_basis_get(PointerRNA *ptr, float values[16]) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BKE_object_to_mat4(ob, (float(*)[4])values); } static void rna_Object_matrix_basis_set(PointerRNA *ptr, const float values[16]) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BKE_object_apply_mat4(ob, (float(*)[4])values, false, false); } void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - DEG_id_tag_update(ptr->id.data, ID_RECALC_GEOMETRY); - WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data); + DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY); + WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->owner_id); } void rna_Object_internal_update_data_dependency(Main *bmain, Scene *scene, PointerRNA *ptr) @@ -389,7 +389,7 @@ void rna_Object_internal_update_data_dependency(Main *bmain, Scene *scene, Point static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) { - Object *ob = ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -422,9 +422,9 @@ static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) static void rna_Object_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { - DEG_id_tag_update(ptr->id.data, ID_RECALC_TRANSFORM); + DEG_id_tag_update(ptr->owner_id, ID_RECALC_TRANSFORM); DEG_relations_tag_update(bmain); - WM_main_add_notifier(NC_OBJECT | ND_PARENT, ptr->id.data); + WM_main_add_notifier(NC_OBJECT | ND_PARENT, ptr->owner_id); } static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value, struct ReportList *reports) @@ -691,7 +691,7 @@ static void rna_Object_dup_collection_set(PointerRNA *ptr, static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bDeformGroup *dg = (bDeformGroup *)ptr->data; BLI_strncpy_utf8(dg->name, value, sizeof(dg->name)); defgroup_unique_name(dg, ob); @@ -699,34 +699,34 @@ static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value) static int rna_VertexGroup_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return BLI_findindex(&ob->defbase, ptr->data); } static PointerRNA rna_Object_active_vertex_group_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return rna_pointer_inherit_refine( ptr, &RNA_VertexGroup, BLI_findlink(&ob->defbase, ob->actdef - 1)); } static int rna_Object_active_vertex_group_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return ob->actdef - 1; } static void rna_Object_active_vertex_group_index_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; ob->actdef = value + 1; } static void rna_Object_active_vertex_group_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *min = 0; *max = max_ii(0, BLI_listbase_count(&ob->defbase) - 1); @@ -734,7 +734,7 @@ static void rna_Object_active_vertex_group_index_range( void rna_object_vgroup_name_index_get(PointerRNA *ptr, char *value, int index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bDeformGroup *dg; dg = BLI_findlink(&ob->defbase, index - 1); @@ -749,7 +749,7 @@ void rna_object_vgroup_name_index_get(PointerRNA *ptr, char *value, int index) int rna_object_vgroup_name_index_length(PointerRNA *ptr, int index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bDeformGroup *dg; dg = BLI_findlink(&ob->defbase, index - 1); @@ -758,13 +758,13 @@ int rna_object_vgroup_name_index_length(PointerRNA *ptr, int index) void rna_object_vgroup_name_index_set(PointerRNA *ptr, const char *value, short *index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *index = defgroup_name_index(ob, value) + 1; } void rna_object_vgroup_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bDeformGroup *dg = defgroup_find_name(ob, value); if (dg) { /* No need for BLI_strncpy_utf8, since this matches an existing group. */ @@ -777,7 +777,7 @@ void rna_object_vgroup_name_set(PointerRNA *ptr, const char *value, char *result static void rna_FaceMap_name_set(PointerRNA *ptr, const char *value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bFaceMap *fmap = (bFaceMap *)ptr->data; BLI_strncpy_utf8(fmap->name, value, sizeof(fmap->name)); BKE_object_facemap_unique_name(ob, fmap); @@ -785,33 +785,33 @@ static void rna_FaceMap_name_set(PointerRNA *ptr, const char *value) static int rna_FaceMap_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return BLI_findindex(&ob->fmaps, ptr->data); } static PointerRNA rna_Object_active_face_map_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return rna_pointer_inherit_refine(ptr, &RNA_FaceMap, BLI_findlink(&ob->fmaps, ob->actfmap - 1)); } static int rna_Object_active_face_map_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return ob->actfmap - 1; } static void rna_Object_active_face_map_index_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; ob->actfmap = value + 1; } static void rna_Object_active_face_map_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *min = 0; *max = max_ii(0, BLI_listbase_count(&ob->fmaps) - 1); @@ -819,7 +819,7 @@ static void rna_Object_active_face_map_index_range( void rna_object_BKE_object_facemap_name_index_get(PointerRNA *ptr, char *value, int index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bFaceMap *fmap; fmap = BLI_findlink(&ob->fmaps, index - 1); @@ -834,7 +834,7 @@ void rna_object_BKE_object_facemap_name_index_get(PointerRNA *ptr, char *value, int rna_object_BKE_object_facemap_name_index_length(PointerRNA *ptr, int index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bFaceMap *fmap; fmap = BLI_findlink(&ob->fmaps, index - 1); @@ -843,13 +843,13 @@ int rna_object_BKE_object_facemap_name_index_length(PointerRNA *ptr, int index) void rna_object_BKE_object_facemap_name_index_set(PointerRNA *ptr, const char *value, short *index) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *index = BKE_object_facemap_name_index(ob, value) + 1; } void rna_object_fmap_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bFaceMap *fmap = BKE_object_facemap_find_name(ob, value); if (fmap) { /* No need for BLI_strncpy_utf8, since this matches an existing group. */ @@ -862,7 +862,7 @@ void rna_object_fmap_name_set(PointerRNA *ptr, const char *value, char *result, void rna_object_uvlayer_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Mesh *me; CustomDataLayer *layer; int a; @@ -885,7 +885,7 @@ void rna_object_uvlayer_name_set(PointerRNA *ptr, const char *value, char *resul void rna_object_vcollayer_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Mesh *me; CustomDataLayer *layer; int a; @@ -908,13 +908,13 @@ void rna_object_vcollayer_name_set(PointerRNA *ptr, const char *value, char *res static int rna_Object_active_material_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return MAX2(ob->actcol - 1, 0); } static void rna_Object_active_material_index_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; ob->actcol = value + 1; if (ob->type == OB_MESH) { @@ -929,7 +929,7 @@ static void rna_Object_active_material_index_set(PointerRNA *ptr, int value) static void rna_Object_active_material_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *min = 0; *max = max_ii(ob->totcol - 1, 0); } @@ -937,7 +937,7 @@ static void rna_Object_active_material_index_range( /* returns active base material */ static PointerRNA rna_Object_active_material_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Material *ma; ma = (ob->totcol) ? give_current_material(ob, ob->actcol) : NULL; @@ -948,7 +948,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr, PointerRNA value, struct ReportList *UNUSED(reports)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; DEG_id_tag_update(value.data, 0); BLI_assert(BKE_id_is_in_global_main(&ob->id)); @@ -963,7 +963,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr, static int rna_Object_active_material_editable(PointerRNA *ptr, const char **UNUSED(r_info)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bool is_editable; if ((ob->matbits == NULL) || (ob->actcol == 0) || ob->matbits[ob->actcol - 1]) { @@ -979,20 +979,20 @@ static int rna_Object_active_material_editable(PointerRNA *ptr, const char **UNU static void rna_Object_active_particle_system_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; *min = 0; *max = max_ii(0, BLI_listbase_count(&ob->particlesystem) - 1); } static int rna_Object_active_particle_system_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return psys_get_current_num(ob); } static void rna_Object_active_particle_system_index_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; psys_set_current_num(ob, value); } @@ -1000,7 +1000,7 @@ static void rna_Object_particle_update(Main *UNUSED(bmain), Scene *scene, Pointe { /* TODO: Disabled for now, because bContext is not available. */ # if 0 - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; PE_current_changed(NULL, scene, ob); # else (void)scene; @@ -1137,7 +1137,7 @@ static int rna_Object_rotation_4d_editable(PointerRNA *ptr, int index) static int rna_MaterialSlot_material_editable(PointerRNA *ptr, const char **UNUSED(r_info)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; const int index = (Material **)ptr->data - ob->mat; bool is_editable; @@ -1153,7 +1153,7 @@ static int rna_MaterialSlot_material_editable(PointerRNA *ptr, const char **UNUS static PointerRNA rna_MaterialSlot_material_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Material *ma; const int index = (Material **)ptr->data - ob->mat; @@ -1165,7 +1165,7 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr, PointerRNA value, struct ReportList *UNUSED(reports)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; int index = (Material **)ptr->data - ob->mat; BLI_assert(BKE_id_is_in_global_main(&ob->id)); @@ -1175,7 +1175,7 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr, static bool rna_MaterialSlot_material_poll(PointerRNA *ptr, PointerRNA value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Material *ma = (Material *)value.data; if (ob->type == OB_GPENCIL) { @@ -1190,7 +1190,7 @@ static bool rna_MaterialSlot_material_poll(PointerRNA *ptr, PointerRNA value) static int rna_MaterialSlot_link_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; int index = (Material **)ptr->data - ob->mat; return ob->matbits[index] != 0; @@ -1198,7 +1198,7 @@ static int rna_MaterialSlot_link_get(PointerRNA *ptr) static void rna_MaterialSlot_link_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; int index = (Material **)ptr->data - ob->mat; if (value) { @@ -1213,7 +1213,7 @@ static void rna_MaterialSlot_link_set(PointerRNA *ptr, int value) static int rna_MaterialSlot_name_length(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Material *ma; int index = (Material **)ptr->data - ob->mat; @@ -1228,7 +1228,7 @@ static int rna_MaterialSlot_name_length(PointerRNA *ptr) static void rna_MaterialSlot_name_get(PointerRNA *ptr, char *str) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Material *ma; int index = (Material **)ptr->data - ob->mat; @@ -1246,14 +1246,14 @@ static void rna_MaterialSlot_update(Main *bmain, Scene *scene, PointerRNA *ptr) { rna_Object_internal_update(bmain, scene, ptr); - WM_main_add_notifier(NC_OBJECT | ND_OB_SHADING, ptr->id.data); + WM_main_add_notifier(NC_OBJECT | ND_OB_SHADING, ptr->owner_id); WM_main_add_notifier(NC_MATERIAL | ND_SHADING_LINKS, NULL); DEG_relations_tag_update(bmain); } static char *rna_MaterialSlot_path(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; int index = (Material **)ptr->data - ob->mat; return BLI_sprintfN("material_slots[%d]", index); @@ -1271,7 +1271,7 @@ static char *rna_ObjectDisplay_path(PointerRNA *UNUSED(ptr)) static PointerRNA rna_Object_active_particle_system_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; ParticleSystem *psys = psys_get_current(ob); return rna_pointer_inherit_refine(ptr, &RNA_ParticleSystem, psys); } @@ -1279,7 +1279,7 @@ static PointerRNA rna_Object_active_particle_system_get(PointerRNA *ptr) static void rna_Object_active_shape_key_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Key *key = BKE_key_from_object(ob); *min = 0; @@ -1296,21 +1296,21 @@ static void rna_Object_active_shape_key_index_range( static int rna_Object_active_shape_key_index_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; return MAX2(ob->shapenr - 1, 0); } static void rna_Object_active_shape_key_index_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; ob->shapenr = value + 1; } static PointerRNA rna_Object_active_shape_key_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; Key *key = BKE_key_from_object(ob); KeyBlock *kb; PointerRNA keyptr; @@ -1326,7 +1326,7 @@ static PointerRNA rna_Object_active_shape_key_get(PointerRNA *ptr) static PointerRNA rna_Object_field_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; /* weak */ if (!ob->pd) { @@ -1338,7 +1338,7 @@ static PointerRNA rna_Object_field_get(PointerRNA *ptr) static PointerRNA rna_Object_collision_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; if (ob->type != OB_MESH) { return PointerRNA_NULL; @@ -1354,7 +1354,7 @@ static PointerRNA rna_Object_collision_get(PointerRNA *ptr) static PointerRNA rna_Object_active_constraint_get(PointerRNA *ptr) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; bConstraint *con = BKE_constraints_active_get(&ob->constraints); return rna_pointer_inherit_refine(ptr, &RNA_Constraint, con); } @@ -1363,7 +1363,7 @@ static void rna_Object_active_constraint_set(PointerRNA *ptr, PointerRNA value, struct ReportList *UNUSED(reports)) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BKE_constraints_active_set(&ob->constraints, (bConstraint *)value.data); } @@ -1428,8 +1428,8 @@ bool rna_Object_constraints_override_apply(Main *UNUSED(bmain), BLI_assert(opop->operation == IDOVERRIDE_LIBRARY_OP_INSERT_AFTER && "Unsupported RNA override operation on constraints collection"); - Object *ob_dst = (Object *)ptr_dst->id.data; - Object *ob_src = (Object *)ptr_src->id.data; + Object *ob_dst = (Object *)ptr_dst->owner_id; + Object *ob_src = (Object *)ptr_src->owner_id; /* Remember that insertion operations are defined and stored in correct order, which means that * even if we insert several items in a row, we always insert first one, then second one, etc. @@ -1516,8 +1516,8 @@ bool rna_Object_modifiers_override_apply(Main *UNUSED(bmain), BLI_assert(opop->operation == IDOVERRIDE_LIBRARY_OP_INSERT_AFTER && "Unsupported RNA override operation on modifiers collection"); - Object *ob_dst = (Object *)ptr_dst->id.data; - Object *ob_src = (Object *)ptr_src->id.data; + Object *ob_dst = (Object *)ptr_dst->owner_id; + Object *ob_src = (Object *)ptr_src->owner_id; /* Remember that insertion operations are defined and stored in correct order, which means that * even if we insert several items in a row, we always insert first one, then second one, etc. @@ -1619,7 +1619,7 @@ static void rna_Object_shaderfx_clear(Object *object, bContext *C) static void rna_Object_boundbox_get(PointerRNA *ptr, float *values) { - Object *ob = (Object *)ptr->id.data; + Object *ob = (Object *)ptr->owner_id; BoundBox *bb = BKE_object_boundbox_get(ob); if (bb) { memcpy(values, bb->vec, sizeof(bb->vec)); @@ -1791,42 +1791,42 @@ static void rna_FaceMap_face_remove( /* generic poll functions */ bool rna_Lattice_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_LATTICE; + return ((Object *)value.owner_id)->type == OB_LATTICE; } bool rna_Curve_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_CURVE; + return ((Object *)value.owner_id)->type == OB_CURVE; } bool rna_Armature_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_ARMATURE; + return ((Object *)value.owner_id)->type == OB_ARMATURE; } bool rna_Mesh_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_MESH; + return ((Object *)value.owner_id)->type == OB_MESH; } bool rna_Camera_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_CAMERA; + return ((Object *)value.owner_id)->type == OB_CAMERA; } bool rna_Light_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_LAMP; + return ((Object *)value.owner_id)->type == OB_LAMP; } bool rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - return ((Object *)value.id.data)->type == OB_GPENCIL; + return ((Object *)value.owner_id)->type == OB_GPENCIL; } int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr) { - SculptSession *ss = ((Object *)ptr->id.data)->sculpt; + SculptSession *ss = ((Object *)ptr->owner_id)->sculpt; return (ss && ss->bm); } |