[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42565] branches/bmesh/blender: svn merge ^/trunk/blender -r42550:42564
Campbell Barton
ideasman42 at gmail.com
Sun Dec 11 02:06:48 CET 2011
Revision: 42565
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42565
Author: campbellbarton
Date: 2011-12-11 01:06:43 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42550:42564
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42550
Modified Paths:
--------------
branches/bmesh/blender/extern/libmv/CMakeLists.txt
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42550
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42564
Modified: branches/bmesh/blender/extern/libmv/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/libmv/CMakeLists.txt 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/extern/libmv/CMakeLists.txt 2011-12-11 01:06:43 UTC (rev 42565)
@@ -148,23 +148,23 @@
third_party/glog/src/vlog_is_on.cc
third_party/glog/src/windows/port.cc
- third_party/glog/src/utilities.h
+ third_party/glog/src/config.h
+ third_party/glog/src/stacktrace.h
third_party/glog/src/stacktrace_generic-inl.h
- third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
third_party/glog/src/stacktrace_x86_64-inl.h
+ third_party/glog/src/utilities.h
+ third_party/glog/src/base/commandlineflags.h
third_party/glog/src/base/googleinit.h
third_party/glog/src/base/mutex.h
- third_party/glog/src/base/commandlineflags.h
- third_party/glog/src/stacktrace_powerpc-inl.h
- third_party/glog/src/stacktrace_x86-inl.h
- third_party/glog/src/config.h
- third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/windows/config.h
+ third_party/glog/src/windows/port.h
+ third_party/glog/src/windows/glog/log_severity.h
+ third_party/glog/src/windows/glog/logging.h
third_party/glog/src/windows/glog/raw_logging.h
third_party/glog/src/windows/glog/vlog_is_on.h
- third_party/glog/src/windows/glog/logging.h
- third_party/glog/src/windows/glog/log_severity.h
- third_party/glog/src/windows/port.h
- third_party/glog/src/windows/config.h
)
list(APPEND INC
@@ -184,7 +184,7 @@
string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endforeach()
endif()
-else(WIN32)
+else()
list(APPEND SRC
third_party/glog/src/utilities.cc
third_party/glog/src/symbolize.cc
@@ -194,25 +194,26 @@
third_party/glog/src/demangle.cc
third_party/glog/src/raw_logging.cc
- third_party/glog/src/utilities.h
- third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/config.h
+ third_party/glog/src/config_freebsd.h
+ third_party/glog/src/config_linux.h
third_party/glog/src/config_mac.h
+ third_party/glog/src/demangle.h
third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
third_party/glog/src/stacktrace_x86_64-inl.h
third_party/glog/src/symbolize.h
+ third_party/glog/src/utilities.h
+ third_party/glog/src/base/commandlineflags.h
third_party/glog/src/base/googleinit.h
third_party/glog/src/base/mutex.h
- third_party/glog/src/base/commandlineflags.h
- third_party/glog/src/stacktrace_powerpc-inl.h
- third_party/glog/src/stacktrace_x86-inl.h
- third_party/glog/src/config.h
- third_party/glog/src/demangle.h
- third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/glog/log_severity.h
+ third_party/glog/src/glog/logging.h
third_party/glog/src/glog/raw_logging.h
third_party/glog/src/glog/vlog_is_on.h
- third_party/glog/src/glog/logging.h
- third_party/glog/src/glog/log_severity.h
- third_party/glog/src/config_linux.h
)
list(APPEND INC
@@ -220,6 +221,9 @@
)
endif()
-add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
+add_definitions(
+ -DV3DLIB_ENABLE_SUITESPARSE
+ -DGOOGLE_GLOG_DLL_DECL=
+)
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548
+ /trunk/blender/release:31524-42516,42522-42548,42551-42564
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-12-11 01:06:43 UTC (rev 42565)
@@ -546,6 +546,11 @@
row.prop(brush, "strength", text="Strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
+ if tool == 'ROTATE':
+ row = col.row(align=True)
+ row.prop(brush, "strength", text="Strength", slider=True)
+ row.prop(brush, "use_pressure_strength", text="")
+
if tool != 'SMOOTH':
col.separator()
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h 2011-12-11 01:06:43 UTC (rev 42565)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 260
-#define BLENDER_SUBVERSION 7
+#define BLENDER_SUBVERSION 8
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/brush.c 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/brush.c 2011-12-11 01:06:43 UTC (rev 42565)
@@ -384,6 +384,7 @@
br->sub_col[1] = 1.000000;
break;
case SCULPT_TOOL_ROTATE:
+ br->alpha = 1.0;
break;
case SCULPT_TOOL_SMOOTH:
br->flag &= ~BRUSH_SPACE_ATTEN;
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-12-11 01:06:43 UTC (rev 42565)
@@ -12737,6 +12737,16 @@
}
}
+ if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 8))
+ {
+ Brush *brush;
+
+ for (brush= main->brush.first; brush; brush= brush->id.next) {
+ if (brush->sculpt_tool == SCULPT_TOOL_ROTATE)
+ brush->alpha= 1.0f;
+ }
+ }
+
/* put compatibility code here until next subversion bump */
{
/* nothing! */
Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-12-11 01:06:43 UTC (rev 42565)
@@ -648,9 +648,11 @@
return feather;
case SCULPT_TOOL_GRAB:
- case SCULPT_TOOL_ROTATE:
return feather;
+ case SCULPT_TOOL_ROTATE:
+ return alpha*pressure*feather;
+
default:
return 0;
}
@@ -1502,14 +1504,21 @@
float bstrength= ss->cache->bstrength;
float an[3];
int n;
- float m[3][3];
+ float m[4][4], rot[4][4], lmat[4][4], ilmat[4][4];
static const int flip[8] = { 1, -1, -1, 1, -1, 1, 1, -1 };
float angle = ss->cache->vertex_rotation * flip[ss->cache->mirror_symmetry_pass];
calc_sculpt_normal(sd, ob, an, nodes, totnode);
- axis_angle_to_mat3(m, an, angle);
+ unit_m4(m);
+ unit_m4(lmat);
+ copy_v3_v3(lmat[3], ss->cache->location);
+ invert_m4_m4(ilmat, lmat);
+ axis_angle_to_mat4(rot, an, angle);
+
+ mul_serie_m4(m, lmat, rot, ilmat, NULL, NULL, NULL, NULL, NULL);
+
#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
for(n=0; n<totnode; n++) {
PBVHVertexIter vd;
@@ -1532,7 +1541,7 @@
const float fade = bstrength*tex_strength(ss, brush, origco[vd.i], test.dist,
an, origno[vd.i], NULL);
- mul_v3_m3v3(proxy[vd.i], m, origco[vd.i]);
+ mul_v3_m4v3(proxy[vd.i], m, origco[vd.i]);
sub_v3_v3(proxy[vd.i], origco[vd.i]);
mul_v3_fl(proxy[vd.i], fade);
@@ -3160,7 +3169,7 @@
dx = cache->mouse[0] - cache->initial_mouse[0];
dy = cache->mouse[1] - cache->initial_mouse[1];
- cache->vertex_rotation = -atan2(dx, dy);
+ cache->vertex_rotation = -atan2(dx, dy) * cache->bstrength;
sd->draw_anchored = 1;
copy_v2_v2(sd->anchored_initial_mouse, cache->initial_mouse);
Modified: branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/node_edit.c 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/editors/space_node/node_edit.c 2011-12-11 01:06:43 UTC (rev 42565)
@@ -483,6 +483,7 @@
}
else {
*ntree= NULL;
+ *edittree= NULL;
if(treetype) *treetype= 0;
}
}
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h 2011-12-11 00:53:37 UTC (rev 42564)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h 2011-12-11 01:06:43 UTC (rev 42565)
@@ -255,7 +255,7 @@
#define CU_STRETCH 128
#define CU_OFFS_PATHDIST 256
#define CU_FAST 512 /* Font: no filling inside editmode */
-#define CU_RETOPO 1024
+/* #define CU_RETOPO 1024 */ /* DEPRECATED */
#define CU_DS_EXPAND 2048
#define CU_PATH_RADIUS 4096 /* make use of the path radius if this is enabled (default for new curves) */
#define CU_DEFORM_FILL 8192 /* fill 2d curve after deformation */
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h 2011-12-11 00:53:37 UTC (rev 42564)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list