Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/makesrna/intern/rna_object.c2
-rw-r--r--source/blender/makesrna/intern/rna_particle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index c7a1284e35e..a5ec30bd624 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -739,7 +739,7 @@ static PointerRNA rna_Object_game_settings_get(PointerRNA *ptr)
static unsigned int rna_Object_layer_validate__internal(const int *values, unsigned int lay)
{
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some layer selected */
for(i=0; i<20; i++)
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index a70a5572ef0..ad73f279b45 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -593,7 +593,7 @@ static void psys_vg_name_set__internal(PointerRNA *ptr, const char *value, int i
psys->vgroup[index]= 0;
}
else {
- int vgroup_num = get_named_vertexgroup_num(ob, value);
+ int vgroup_num = get_named_vertexgroup_num(ob, (char*)value);
if(vgroup_num == -1)
return;