Revision: 39893
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39893
Author: campbellbarton
Date: 2011-09-03 15:36:36 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
warning fixes
Modified Paths:
--------------
trunk/blender/intern/iksolver/intern/IK_QSegment.cpp
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/ExtraTags.cpp
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
Modified: trunk/blender/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_QSegment.cpp 2011-09-03
13:08:38 UTC (rev 39892)
+++ trunk/blender/intern/iksolver/intern/IK_QSegment.cpp 2011-09-03
15:36:36 UTC (rev 39893)
@@ -319,7 +319,7 @@
else {
IK_QSegment *seg = m_child;
- while (seg->m_sibling != child);
+ while (seg->m_sibling != child)
seg = seg->m_sibling;
if (child == seg->m_sibling)
Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
2011-09-03 13:08:38 UTC (rev 39892)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
2011-09-03 15:36:36 UTC (rev 39893)
@@ -166,7 +166,7 @@
}
if(BLI_edgehash_haskey(edge_hash, med->v1, med->v2)) {
- PRINT(" edge %u: is a duplicate of, %u\n", i,
GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2)));
+ PRINT(" edge %u: is a duplicate of, %d\n", i,
GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2)));
remove= do_fixes;
}
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-09-03
13:08:38 UTC (rev 39892)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-09-03
15:36:36 UTC (rev 39893)
@@ -328,10 +328,8 @@
//scale = RNA_struct_find_property(&unit_settings, "scale_length");
std::string unitname = "meter";
- float linearmeasure = 1.0f;
+ float linearmeasure = RNA_float_get(&unit_settings, "scale_length");
- linearmeasure = RNA_float_get(&unit_settings, "scale_length");
-
switch(RNA_property_enum_get(&unit_settings, system)) {
case USER_UNIT_NONE:
case USER_UNIT_METRIC:
@@ -368,8 +366,7 @@
asset.setUnit(unitname, linearmeasure);
asset.setUpAxisType(COLLADASW::Asset::Z_UP);
- // TODO: need an Author field in userpref
- if(strlen(U.author) > 0) {
+ if(U.author[0] != '\0') {
asset.getContributor().mAuthor = U.author;
}
else {
Modified: trunk/blender/source/blender/collada/ExtraTags.cpp
===================================================================
--- trunk/blender/source/blender/collada/ExtraTags.cpp 2011-09-03 13:08:38 UTC
(rev 39892)
+++ trunk/blender/source/blender/collada/ExtraTags.cpp 2011-09-03 15:36:36 UTC
(rev 39893)
@@ -90,32 +90,28 @@
void ExtraTags::setData(std::string tag, short *data)
{
bool ok = false;
- int tmp = 0;
- tmp = asInt(tag, &ok);
+ int tmp = asInt(tag, &ok);
if(ok)
*data = (short)tmp;
}
void ExtraTags::setData(std::string tag, int *data)
{
bool ok = false;
- int tmp = 0;
- tmp = asInt(tag, &ok);
+ int tmp = asInt(tag, &ok);
if(ok)
*data = tmp;
}
void ExtraTags::setData(std::string tag, float *data)
{
bool ok = false;
- float tmp = 0.0f;
- tmp = asFloat(tag, &ok);
+ float tmp = asFloat(tag, &ok);
if(ok)
*data = tmp;
}
void ExtraTags::setData(std::string tag, char *data)
{
bool ok = false;
- int tmp = 0;
- tmp = asInt(tag, &ok);
+ int tmp = asInt(tag, &ok);
if(ok)
*data = (char)tmp;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
2011-09-03 13:08:38 UTC (rev 39892)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
2011-09-03 15:36:36 UTC (rev 39893)
@@ -111,7 +111,7 @@
#ifdef WITH_COLLADA
/* don't remove this, as COLLADA exporting cannot be done through
operators in render() callback. */
func= RNA_def_function(srna, "collada_export",
"rna_Scene_collada_export");
- parm= RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File
path to write Collada file.");
+ RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File path
to write Collada file.");
parm= RNA_def_boolean(func, "selected", 0, "Export only selected",
"Export only selected elements.");
RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
