[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24449] trunk/blender/source: fix for own error in active bone commit, wasnt checking object type was an armature

[Campbell Barton]

Revision: 24449
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24449
Author:   campbellbarton
Date:     2009-11-10 14:20:32 +0100 (Tue, 10 Nov 2009)

Log Message:
-----------
fix for own error in active bone commit, wasnt checking object type was an 
armature
also fix for warning with printf

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_context.c
    trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.cpp

Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c        
2009-11-10 12:56:46 UTC (rev 24448)
+++ trunk/blender/source/blender/editors/screen/screen_context.c        
2009-11-10 13:20:32 UTC (rev 24449)
@@ -224,17 +224,19 @@
                }
        }
        else if(CTX_data_equals(member, "active_bone")) {
-               bArmature *arm= (obact) ? obact->data : NULL;
-               if(arm->edbo) {
-                       if(arm->act_edbone) {
-                               CTX_data_pointer_set(result, &arm->id, 
&RNA_EditBone, arm->act_edbone);
-                               return 1;
+               if(obact && obact->type == OB_ARMATURE) {
+                       bArmature *arm= obact->data;
+                       if(arm->edbo) {
+                               if(arm->act_edbone) {
+                                       CTX_data_pointer_set(result, &arm->id, 
&RNA_EditBone, arm->act_edbone);
+                                       return 1;
+                               }
                        }
-               }
-               else {
-                       if(arm->act_bone) {
-                               CTX_data_pointer_set(result, &arm->id, 
&RNA_Bone, arm->act_bone);
-                               return 1;
+                       else {
+                               if(arm->act_bone) {
+                                       CTX_data_pointer_set(result, &arm->id, 
&RNA_Bone, arm->act_bone);
+                                       return 1;
+                               }
                        }
                }
        }

Modified: trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.cpp      
2009-11-10 12:56:46 UTC (rev 24448)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.cpp      
2009-11-10 13:20:32 UTC (rev 24449)
@@ -107,7 +107,7 @@
                {
                        if (value->IsError())
                        {
-                               printf(value->GetText());
+                               printf("%s\n", value->GetText().ReadPtr());
                        } else
                        {
                                float num = (float)value->GetNumber();


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs