diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 09:46:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 09:53:15 +0400 |
commit | e95fd792582324bd93077358e0393e78273a76d3 (patch) | |
tree | 6551c12588f5f3729dd4826955d196a267c643f8 | |
parent | 11299f5ff405a7668ae06ee7ea5495b624f9ce9a (diff) |
Correction for error in own recent commit (makesrna c++ api, un-init var)
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 2 | ||||
-rw-r--r-- | source/blender/editors/animation/drivers.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 71a6e195631..01dbe01d152 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -2379,7 +2379,7 @@ void barycentric_transform(float pt_tar[3], float const pt_src[3], const float tri_src_p1[3], const float tri_src_p2[3], const float tri_src_p3[3]) { /* this works by moving the source triangle so its normal is pointing on the Z - * axis where its barycentric wights can be calculated in 2D and its Z offset can + * axis where its barycentric weights can be calculated in 2D and its Z offset can * be re-applied. The weights are applied directly to the targets 3D points and the * z-depth is used to scale the targets normal as an offset. * This saves transforming the target into its Z-Up orientation and back (which could also work) */ diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 808eb6656d3..8f3fa66552c 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -169,7 +169,7 @@ int ANIM_add_driver(ReportList *reports, ID *id, const char rna_path[], int arra PropertyRNA *prop; FCurve *fcu; int array_index_max; - int done_tot; + int done_tot = 0; /* validate pointer first - exit if failure */ RNA_id_pointer_create(id, &id_ptr); diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 189e75935d1..76a967753c0 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3517,7 +3517,7 @@ static const char *cpp_classes = "" "#define POINTER_PROPERTY(type, sname, identifier) \\\n" " inline type sname::identifier(void) { return type(sname##_##identifier##_get(&ptr)); }\n" "\n" -"#define COLLECTION_PROPERTY_LENGTH_FALSE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LENGTH_false(sname, identifier) \\\n" " inline static int sname##_##identifier##_length_wrap(PointerRNA *ptr) \\\n" " { \\\n" " CollectionPropertyIterator iter; \\\n" @@ -3530,11 +3530,11 @@ static const char *cpp_classes = "" " sname##_##identifier##_end(&iter); \\\n" " return length; \\\n" " } \n" -"#define COLLECTION_PROPERTY_LENGTH_TRUE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LENGTH_true(sname, identifier) \\\n" " inline static int sname##_##identifier##_length_wrap(PointerRNA *ptr) \\\n" " { return sname##_##identifier##_length(ptr); } \n" "\n" -"#define COLLECTION_PROPERTY_LOOKUP_INT_FALSE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LOOKUP_INT_false(sname, identifier) \\\n" " inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, PointerRNA *r_ptr) \\\n" " { \\\n" " CollectionPropertyIterator iter; \\\n" @@ -3554,7 +3554,7 @@ static const char *cpp_classes = "" " memset(r_ptr, 0, sizeof(*r_ptr)); \\\n" " return found; \\\n" " } \n" -"#define COLLECTION_PROPERTY_LOOKUP_INT_TRUE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LOOKUP_INT_true(sname, identifier) \\\n" " inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, PointerRNA *r_ptr) \\\n" " { \\\n" " int found = sname##_##identifier##_lookup_int(ptr, key, r_ptr); \\\n" @@ -3562,7 +3562,7 @@ static const char *cpp_classes = "" " memset(r_ptr, 0, sizeof(*r_ptr)); \\\n" " return found; \\\n" " } \n" -"#define COLLECTION_PROPERTY_LOOKUP_STRING_FALSE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LOOKUP_STRING_false(sname, identifier) \\\n" " inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) \\\n" " { \\\n" " CollectionPropertyIterator iter; \\\n" @@ -3587,7 +3587,7 @@ static const char *cpp_classes = "" " memset(r_ptr, 0, sizeof(*r_ptr)); \\\n" " return found; \\\n" " } \n" -"#define COLLECTION_PROPERTY_LOOKUP_STRING_TRUE(sname, identifier) \\\n" +"#define COLLECTION_PROPERTY_LOOKUP_STRING_true(sname, identifier) \\\n" " inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) \\\n" " { \\\n" " int found = sname##_##identifier##_lookup_string(ptr, key, r_ptr); \\\n" |