fix for G,G causing vertex slide in UV/Image window, also comment unused defines...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 08:49:40 +0000 (08:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 08:49:40 +0000 (08:49 +0000)
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/render/intern/source/multires_bake.c

index 00bdf0697699f727d13daab98a3349d873fea4a5..d29326db6b0b5b1f63c013359a9c35953d9b8318 100644 (file)
@@ -896,7 +896,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
                                }
                                else {
                                        if (t->obedit && t->obedit->type == OB_MESH) {
-                                               if (t->mode == TFM_TRANSLATION) {
+                                               if ((t->mode == TFM_TRANSLATION) && (t->spacetype == SPACE_VIEW3D)) {
                                                        resetTransRestrictions(t);
                                                        restoreTransObjects(t);
 
index e935592ecfb11c607d544ae5fb3be8c29b4ed110..41c47f8de1593630a94babf0ae8389f5b9463f4f 100644 (file)
@@ -112,7 +112,7 @@ typedef enum BrushFlags {
        BRUSH_SIZE_PRESSURE = (1 << 3),
        BRUSH_JITTER_PRESSURE = (1 << 4),
        BRUSH_SPACING_PRESSURE = (1 << 5),
-       BRUSH_FIXED_TEX = (1 << 6), /* obsolete, use mtex->brush_map_mode = MTEX_MAP_MODE_TILED instead */
+       // BRUSH_FIXED_TEX = (1 << 6), /* obsolete, use mtex->brush_map_mode = MTEX_MAP_MODE_TILED instead */
        BRUSH_RAKE = (1 << 7),
        BRUSH_ANCHORED = (1 << 8),
        BRUSH_DIR_IN = (1 << 9),
index 9a8d3bf981c992fb146c5c44caf34aedacee015d..fceea396507183c54f8a5ab67324e74ce3c782b2 100644 (file)
@@ -309,7 +309,7 @@ typedef struct Material {
 #define MA_SPEC_WARDISO                4
 
 /* dynamode */
-#define MA_DRAW_DYNABUTS    1          /* deprecated */
+// #define MA_DRAW_DYNABUTS    1               /* deprecated */
 #define MA_FH_NOR              2
 
 /* ramps */
@@ -373,7 +373,7 @@ typedef struct Material {
 #define MAP_AMB                        2048
 #define MAP_DISPLACE   4096
 #define MAP_WARP               8192
-#define MAP_LAYER              16384           /* unused */
+// #define MAP_LAYER           16384           /* unused */
 
 /* volume mapto - reuse definitions for now - a bit naughty! */
 #define MAP_DENSITY                            128
index a1bb9fb9c3d6d937464301e637cf2ae511a73b73..de34f101c3155c11a1eb44c0632f95314371560a 100644 (file)
@@ -171,7 +171,7 @@ typedef struct Object {
        float sf; /* sf is time-offset */
 
        short flag;                     /* copy of Base */
-       short colbits DNA_DEPRECATED;           /* deprecated */
+       short colbits DNA_DEPRECATED;           /* deprecated, use 'matbits' */
        
        short transflag, protectflag;   /* transformation settings and transform locks  */
        short trackflag, upflag;
index 13c9e6e88bd481272659b2dafaa2c8db76d3222f..89f67335c39974fa12515e6d2b69b38ac222207a 100644 (file)
@@ -452,7 +452,7 @@ static void init_ccgdm_arrays(DerivedMesh *dm)
        grid_offset = dm->getGridOffset(dm);
        dm->getGridKey(dm, &key);
 
-       (void) grid_data;
+       (void) grid_size;
        (void) grid_data;
        (void) grid_offset;
 }