[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33794] trunk/blender/source/blender/ makesrna: Patch from Dan to use id user functions rather then accessing direct.
Campbell Barton
ideasman42 at gmail.com
Sun Dec 19 17:34:58 CET 2010
Revision: 33794
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33794
Author: campbellbarton
Date: 2010-12-19 17:34:58 +0100 (Sun, 19 Dec 2010)
Log Message:
-----------
Patch from Dan to use id user functions rather then accessing direct. also use warning fix using const for RNA_parameter_set() arg.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2010-12-19 16:09:24 UTC (rev 33793)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2010-12-19 16:34:58 UTC (rev 33794)
@@ -919,8 +919,8 @@
void RNA_parameter_get(ParameterList *parms, PropertyRNA *parm, void **value);
void RNA_parameter_get_lookup(ParameterList *parms, const char *identifier, void **value);
-void RNA_parameter_set(ParameterList *parms, PropertyRNA *parm, void *value);
-void RNA_parameter_set_lookup(ParameterList *parms, const char *identifier, void *value);
+void RNA_parameter_set(ParameterList *parms, PropertyRNA *parm, const void *value);
+void RNA_parameter_set_lookup(ParameterList *parms, const char *identifier, const void *value);
int RNA_parameter_length_get(ParameterList *parms, PropertyRNA *parm);
int RNA_parameter_length_get_data(ParameterList *parms, PropertyRNA *parm, void *data);
void RNA_parameter_length_set(ParameterList *parms, PropertyRNA *parm, int length);
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2010-12-19 16:09:24 UTC (rev 33793)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2010-12-19 16:34:58 UTC (rev 33794)
@@ -4122,7 +4122,7 @@
RNA_parameter_get(parms, parm, value);
}
-void RNA_parameter_set(ParameterList *parms, PropertyRNA *parm, void *value)
+void RNA_parameter_set(ParameterList *parms, PropertyRNA *parm, const void *value)
{
ParameterIterator iter;
@@ -4138,7 +4138,7 @@
RNA_parameter_list_end(&iter);
}
-void RNA_parameter_set_lookup(ParameterList *parms, const char *identifier, void *value)
+void RNA_parameter_set_lookup(ParameterList *parms, const char *identifier, const void *value)
{
PropertyRNA *parm;
Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2010-12-19 16:09:24 UTC (rev 33793)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2010-12-19 16:34:58 UTC (rev 33794)
@@ -87,7 +87,7 @@
Camera *rna_Main_cameras_new(Main *bmain, const char *name)
{
ID *id= add_camera(name);
- id->us--;
+ id_us_min(id);
return (Camera *)id;
}
void rna_Main_cameras_remove(Main *bmain, ReportList *reports, struct Camera *camera)
@@ -162,11 +162,11 @@
}
}
- data->us++;
+ id_us_plus(data);
}
ob= add_only_object(type, name);
- ob->id.us--;
+ id_us_min(&ob->id);
ob->data= data;
test_object_materials(ob->data);
@@ -188,7 +188,7 @@
struct Material *rna_Main_materials_new(Main *bmain, const char *name)
{
ID *id= (ID *)add_material(name);
- id->us--;
+ id_us_min(id);
return (Material *)id;
}
void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material *material)
@@ -207,7 +207,7 @@
ntreeMakeOwnType(tree);
- tree->id.us--;
+ id_us_min(&tree->id);
return tree;
}
void rna_Main_nodetree_remove(Main *bmain, ReportList *reports, struct bNodeTree *tree)
@@ -223,7 +223,7 @@
Mesh *rna_Main_meshes_new(Main *bmain, const char *name)
{
Mesh *me= add_mesh(name);
- me->id.us--;
+ id_us_min(&me->id);
return me;
}
void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh)
@@ -239,7 +239,7 @@
Lamp *rna_Main_lamps_new(Main *bmain, const char *name)
{
Lamp *lamp= add_lamp(name);
- lamp->id.us--;
+ id_us_min(&lamp->id);
return lamp;
}
void rna_Main_lamps_remove(Main *bmain, ReportList *reports, Lamp *lamp)
@@ -256,7 +256,7 @@
{
float color[4]= {0.0, 0.0, 0.0, 1.0};
Image *image= BKE_add_image_size(width, height, name, alpha ? 32:24, float_buffer, 0, color);
- image->id.us--;
+ id_us_min(&image->id);
return image;
}
Image *rna_Main_images_load(Main *bmain, ReportList *reports, const char *filepath)
@@ -284,7 +284,7 @@
Lattice *rna_Main_lattices_new(Main *bmain, const char *name)
{
Lattice *lt= add_lattice(name);
- lt->id.us--;
+ id_us_min(<->id);
return lt;
}
void rna_Main_lattices_remove(Main *bmain, ReportList *reports, struct Lattice *lt)
@@ -298,7 +298,7 @@
Curve *rna_Main_curves_new(Main *bmain, const char *name, int type)
{
Curve *cu= add_curve(name, type);
- cu->id.us--;
+ id_us_min(&cu->id);
return cu;
}
void rna_Main_curves_remove(Main *bmain, ReportList *reports, struct Curve *cu)
@@ -312,7 +312,7 @@
MetaBall *rna_Main_metaballs_new(Main *bmain, const char *name)
{
MetaBall *mb= add_mball(name);
- mb->id.us--;
+ id_us_min(&mb->id);
return mb;
}
void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall *mb)
@@ -350,7 +350,7 @@
{
Tex *tex= add_texture(name);
tex_set_type(tex, type);
- tex->id.us--;
+ id_us_min(&tex->id);
return tex;
}
void rna_Main_textures_remove(Main *bmain, ReportList *reports, struct Tex *tex)
@@ -364,7 +364,7 @@
Brush *rna_Main_brushes_new(Main *bmain, const char *name)
{
Brush *brush = add_brush(name);
- brush->id.us--;
+ id_us_min(&brush->id);
return brush;
}
void rna_Main_brushes_remove(Main *bmain, ReportList *reports, struct Brush *brush)
@@ -378,7 +378,7 @@
World *rna_Main_worlds_new(Main *bmain, const char *name)
{
World *world = add_world(name);
- world->id.us--;
+ id_us_min(&world->id);
return world;
}
void rna_Main_worlds_remove(Main *bmain, ReportList *reports, struct World *world)
@@ -427,7 +427,7 @@
bArmature *rna_Main_armatures_new(Main *bmain, const char *name)
{
bArmature *arm= add_armature(name);
- arm->id.us--;
+ id_us_min(&arm->id);
return arm;
}
void rna_Main_armatures_remove(Main *bmain, ReportList *reports, bArmature *arm)
@@ -443,7 +443,7 @@
bAction *rna_Main_actions_new(Main *bmain, const char *name)
{
bAction *act= add_empty_action(name);
- act->id.us--;
+ id_us_min(&act->id);
act->id.flag &= ~LIB_FAKEUSER;
return act;
}
@@ -460,7 +460,7 @@
ParticleSettings *rna_Main_particles_new(Main *bmain, const char *name)
{
ParticleSettings *part = psys_new_settings(name, bmain);
- part->id.us--;
+ id_us_min(&part->id);
return part;
}
void rna_Main_particles_remove(Main *bmain, ReportList *reports, ParticleSettings *part)
More information about the Bf-blender-cvs
mailing list