[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54068] trunk/blender/source/blender: fix for G, G causing vertex slide in UV/Image window, also comment unused defines/enums.
Campbell Barton
ideasman42 at gmail.com
Thu Jan 24 09:49:48 CET 2013
Revision: 54068
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54068
Author: campbellbarton
Date: 2013-01-24 08:49:40 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
fix for G,G causing vertex slide in UV/Image window, also comment unused defines/enums.
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesdna/DNA_material_types.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/render/intern/source/multires_bake.c
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-01-24 08:14:20 UTC (rev 54067)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-01-24 08:49:40 UTC (rev 54068)
@@ -896,7 +896,7 @@
}
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);
Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h 2013-01-24 08:14:20 UTC (rev 54067)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h 2013-01-24 08:49:40 UTC (rev 54068)
@@ -112,7 +112,7 @@
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),
Modified: trunk/blender/source/blender/makesdna/DNA_material_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_material_types.h 2013-01-24 08:14:20 UTC (rev 54067)
+++ trunk/blender/source/blender/makesdna/DNA_material_types.h 2013-01-24 08:49:40 UTC (rev 54068)
@@ -309,7 +309,7 @@
#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 @@
#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
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2013-01-24 08:14:20 UTC (rev 54067)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2013-01-24 08:49:40 UTC (rev 54068)
@@ -171,7 +171,7 @@
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;
Modified: trunk/blender/source/blender/render/intern/source/multires_bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/multires_bake.c 2013-01-24 08:14:20 UTC (rev 54067)
+++ trunk/blender/source/blender/render/intern/source/multires_bake.c 2013-01-24 08:49:40 UTC (rev 54068)
@@ -452,8 +452,8 @@
grid_offset = dm->getGridOffset(dm);
dm->getGridKey(dm, &key);
+ (void) grid_size;
(void) grid_data;
- (void) grid_data;
(void) grid_offset;
}
More information about the Bf-blender-cvs
mailing list