Small fixes;
authorTon Roosendaal <ton@blender.org>
Mon, 12 Sep 2005 15:17:35 +0000 (15:17 +0000)
committerTon Roosendaal <ton@blender.org>
Mon, 12 Sep 2005 15:17:35 +0000 (15:17 +0000)
- "make track" in posemode only worked for objects, so disabled it for now
- in weightpaint, "Clear rotation/location" worked on armature-pose, as well
  as on object. Was confusing... disabled clearing object in weightpaint.

source/blender/src/editobject.c
source/blender/src/space.c

index 6ab702a41d45e9eefe149ca474b8c752bfd25fb5..dd58af0e88ffe19c6d3b83b76e4ce85f8b556b80 100644 (file)
@@ -904,7 +904,7 @@ void clear_object(char mode)
                                // no test if we got armature; could be in future...
                                clear_armature(ob, mode);
                        }
-                       else {
+                       else if((G.f & G_WEIGHTPAINT)==0) {
                                
                                if(mode=='r') {
                                        memset(ob->rot, 0, 3*sizeof(float));
@@ -2000,7 +2000,6 @@ void special_editmenu(void)
                                                                else BIF_undo_push("Boolean");
                                                                waitcursor(0);
                                                        } else {
-                                                               ModifierTypeInfo *mti = modifierType_getInfo(eModifierType_Boolean);
                                                                BooleanModifierData *bmd = NULL;
                                                                bmd = (BooleanModifierData *)modifier_new(eModifierType_Boolean);
                                                                BLI_addtail(&ob->modifiers, bmd);
index fabcadac585b4e2cf3bfda77dac7b5a8b2b10189..ba85649a42e1b72290fbaf29a85108c0b0faf4ec 100644 (file)
@@ -1669,10 +1669,12 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                                        }
                                }
                                else if(G.qual==LR_CTRLKEY) {
-                                       make_track();
+                                       if(ob && (ob->flag & OB_POSEMODE));
+                                       else make_track();
                                }
                                else if(G.qual==LR_ALTKEY) {
-                                       clear_track();
+                                       if(ob && (ob->flag & OB_POSEMODE));
+                                       else clear_track();
                                }
                                else if((G.qual==0)){
                                        texspace_edit();