Revision: 39936
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39936
Author: blendix
Date: 2011-09-05 19:27:21 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Code cleanup: warning fixes.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_math_inline.h
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.h
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Modified: trunk/blender/source/blender/blenlib/BLI_math_inline.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_inline.h 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/blenlib/BLI_math_inline.h 2011-09-05
19:27:21 UTC (rev 39936)
@@ -45,7 +45,7 @@
#define MALWAYS_INLINE MINLINE
#else
#define MINLINE static inline
-#define MALWAYS_INLINE static __attribute__((always_inline))
+#define MALWAYS_INLINE static inline __attribute__((always_inline))
#endif
#else
#define MINLINE
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2011-09-05
19:27:21 UTC (rev 39936)
@@ -643,6 +643,8 @@
case COLLADASW::InputSemantic::OUT_TANGENT:
source.setAccessorStride(2);
break;
+ default:
+ break;
}
@@ -913,7 +915,7 @@
}
if (tm_name.size()) {
- if (axis_name != "")
+ if (axis_name[0])
return tm_name + "." + std::string(axis_name);
else
return tm_name;
@@ -962,7 +964,7 @@
}
if (tm_name.size()) {
- if (axis_name != "")
+ if (axis_name[0])
return tm_name + "." + std::string(axis_name);
else
return tm_name;
@@ -1041,7 +1043,7 @@
if (is_rotation)
return tm_name + std::string(axis_name) + ".ANGLE";
else
- if (axis_name != "")
+ if (axis_name[0])
return tm_name + "." + std::string(axis_name);
else
return tm_name;
Modified: trunk/blender/source/blender/collada/AnimationImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationImporter.cpp 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/AnimationImporter.cpp 2011-09-05
19:27:21 UTC (rev 39936)
@@ -90,12 +90,6 @@
COLLADAFW::FloatOrDoubleArray& input = curve->getInputValues();
COLLADAFW::FloatOrDoubleArray& output = curve->getOutputValues();
- if( curve->getInterpolationType() ==
COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER ||
- curve->getInterpolationType() ==
COLLADAFW::AnimationCurve::INTERPOLATION_STEP ) {
- COLLADAFW::FloatOrDoubleArray& intan =
curve->getInTangentValues();
- COLLADAFW::FloatOrDoubleArray& outtan =
curve->getOutTangentValues();
- }
-
float fps = (float)FPS;
size_t dim = curve->getOutDimension();
unsigned int i;
@@ -572,7 +566,7 @@
}
//creates the rna_paths and array indices of fcurves from animations using
color and bound animation class of each animation.
-void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId&
listid, ListBase *AnimCurves ,char * anim_type)
+void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId&
listid, ListBase *AnimCurves ,const char * anim_type)
{
char rna_path[100];
BLI_strncpy(rna_path,anim_type, sizeof(rna_path));
@@ -615,7 +609,7 @@
}
-void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId&
listid, ListBase *AnimCurves, char * anim_type)
+void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId&
listid, ListBase *AnimCurves, const char * anim_type)
{
char rna_path[100];
if (animlist_map.find(listid) == animlist_map.end()) return ;
@@ -803,7 +797,6 @@
}
bAction * act;
- bActionGroup *grp = NULL;
if ( (animType->transform) != 0 )
{
Modified: trunk/blender/source/blender/collada/AnimationImporter.h
===================================================================
--- trunk/blender/source/blender/collada/AnimationImporter.h 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/AnimationImporter.h 2011-09-05
19:27:21 UTC (rev 39936)
@@ -159,8 +159,8 @@
const
COLLADAFW::AnimationList::AnimationBinding * binding,
std::vector<FCurve*>* curves, bool is_joint, char * joint_path);
- void Assign_color_animations(const COLLADAFW::UniqueId& listid,
ListBase *AnimCurves ,char * anim_type);
- void Assign_float_animations(const COLLADAFW::UniqueId& listid,
ListBase *AnimCurves, char * anim_type);
+ void Assign_color_animations(const COLLADAFW::UniqueId& listid,
ListBase *AnimCurves, const char * anim_type);
+ void Assign_float_animations(const COLLADAFW::UniqueId& listid,
ListBase *AnimCurves, const char * anim_type);
int setAnimType ( const COLLADAFW::Animatable * prop , int type, int
addition);
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-09-05
19:27:21 UTC (rev 39936)
@@ -95,8 +95,6 @@
EditBone *bone = ED_armature_edit_bone_add((bArmature*)ob_arm->data,
(char*)bc_get_joint_name(node));
totbone++;
- bPoseChannel *pchan = get_pose_channel(ob_arm->pose,
(char*)bc_get_joint_name(node));
-
if (parent) bone->parent = parent;
float angle = 0;
@@ -280,8 +278,6 @@
copy_m4_m4(leaf.mat, mat);
BLI_strncpy(leaf.name, bone->name, sizeof(leaf.name));
- float vec[3];
-
TagsMap::iterator etit;
ExtraTags *et = 0;
etit = uid_tags_map.find(node->getUniqueId().toAscii());
@@ -579,7 +575,6 @@
float mat[4][4];
float obmat[4][4];
- bArmature * arm = (bArmature * ) ob_arm-> data ;
float ax[3];
float angle = NULL;
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2011-09-05
19:27:21 UTC (rev 39936)
@@ -240,15 +240,15 @@
root_map[node->getUniqueId()] =
root_map[par->getUniqueId()];
}
- COLLADAFW::Transformation::TransformationType types[] = {
+ /*COLLADAFW::Transformation::TransformationType types[] = {
COLLADAFW::Transformation::ROTATE,
COLLADAFW::Transformation::SCALE,
COLLADAFW::Transformation::TRANSLATE,
COLLADAFW::Transformation::MATRIX
};
+ Object *ob;*/
unsigned int i;
- Object *ob;
//for (i = 0; i < 4; i++)
//ob =
Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/collada/TransformReader.cpp 2011-09-05
19:27:21 UTC (rev 39936)
@@ -37,7 +37,6 @@
{
float cur[4][4];
float copy[4][4];
- float eul[3];
unit_m4(mat);
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-09-05 19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-09-05 19:27:21 UTC (rev 39936)
@@ -3989,40 +3989,6 @@
uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE);
}
-/* The IPO/Fcurve actuator has been deprecated, so this is no longer used */
-static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr)
-{
- Object *ob;
- PointerRNA settings_ptr;
- uiLayout *row, *subrow, *col;
-
- ob = (Object *)ptr->id.data;
- RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob,
&settings_ptr);
-
- row= uiLayoutRow(layout, 0);
- uiItemR(row, ptr, "play_type", 0, "", ICON_NONE);
- subrow= uiLayoutRow(row, 1);
- uiItemR(subrow, ptr, "use_force", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(subrow, ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
- col = uiLayoutColumn(subrow, 0);
- uiLayoutSetActive(col, (RNA_boolean_get(ptr, "use_additive") ||
RNA_boolean_get(ptr, "use_force")));
- uiItemR(col, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-
- row= uiLayoutRow(layout, 0);
- if((RNA_enum_get(ptr, "play_type") == ACT_IPO_FROM_PROP))
- uiItemPointerR(row, ptr, "property", &settings_ptr,
"properties", NULL, ICON_NONE);
-
- else {
- uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NONE);
- uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NONE);
- }
- uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NONE);
-
- row= uiLayoutRow(layout, 0);
- uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties",
NULL, ICON_NONE);
-}
-
static void draw_actuator_message(uiLayout *layout, PointerRNA *ptr, bContext
*C)
{
Object *ob;
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
2011-09-05 19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
2011-09-05 19:27:21 UTC (rev 39936)
@@ -36,6 +36,9 @@
#include <netinet/in.h> /* htonl() */
#endif
#include <string.h> /* memset */
+
+#include "BLI_utildefines.h"
+
#include "cin_debug_stuff.h"
#include "logmemfile.h"
@@ -288,7 +291,7 @@
}
static void
-dumpCineonGenericHeader(CineonGenericHeader* header) {
+UNUSED_FUNCTION(dumpCineonGenericHeader)(CineonGenericHeader* header) {
dumpCineonFileInfo(&header->fileInfo);
dumpCineonImageInfo(&header->imageInfo);
dumpCineonFormatInfo(&header->formatInfo);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
2011-09-05 19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
2011-09-05 19:27:21 UTC (rev 39936)
@@ -38,8 +38,12 @@
#endif
#include "BLO_sys_types.h" // for intptr_t support
+
+#ifdef _MSC_VER
#undef ntohl
#undef htonl
+#endif
+
typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int
lineNum);
typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int
lineNum);
typedef void (CloseFn)(LogImageFile* logImage);
Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2011-09-05
19:13:43 UTC (rev 39935)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2011-09-05
19:27:21 UTC (rev 39936)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
