[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59333] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Tue Aug 20 20:41:22 CEST 2013
Revision: 59333
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59333
Author: gdh
Date: 2013-08-20 18:41:22 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59308 to r59331.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59308
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59331
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/curves.h
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_fileops.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_winstuff.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/storage.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-cycles_mblur/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.h
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_RaySensor.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59307
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59331
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-08-20 18:41:22 UTC (rev 59333)
@@ -711,8 +711,6 @@
void BlenderSync::sync_curve_settings()
{
PointerRNA csscene = RNA_pointer_get(&b_scene.ptr, "cycles_curves");
-
- int preset = CURVE_ACCURATE_PRESET;
CurveSystemManager *curve_system_manager = scene->curve_system_manager;
CurveSystemManager prev_curve_system_manager = *curve_system_manager;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/curves.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/curves.h 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/curves.h 2013-08-20 18:41:22 UTC (rev 59333)
@@ -29,16 +29,6 @@
void curvebounds(float *lower, float *upper, float3 *p, int dim);
-typedef enum curve_presets {
- CURVE_CUSTOM,
- CURVE_FAST_PLANES,
- CURVE_TANGENT_SHADING,
- CURVE_TRUE_NORMAL,
- CURVE_ACCURATE_PRESET,
- CURVE_SMOOTH_CURVES,
- CURVE_SMOOTH_RIBBONS
-} curve_presets;
-
typedef enum curve_primitives {
CURVE_TRIANGLES,
CURVE_LINE_SEGMENTS,
Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemPathsX11.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2013-08-20 18:41:22 UTC (rev 59333)
@@ -42,8 +42,10 @@
#include <cstdlib> /* for exit */
#include <pwd.h> /* for get home without use getenv() */
-#include <limits.h> /* for PATH_MAX */
+#include <string>
+using std::string;
+
#ifdef PREFIX
static const char *static_path = PREFIX "/share";
#else
@@ -62,9 +64,8 @@
{
/* no prefix assumes a portable build which only uses bundled scripts */
if (static_path) {
- static char system_path[PATH_MAX];
- snprintf(system_path, sizeof(system_path), "%s/blender/%s", static_path, versionstr);
- return (GHOST_TUns8 *)system_path;
+ static string system_path = string(static_path) + "/blender/" + versionstr;
+ return (GHOST_TUns8 *)system_path.c_str();
}
return NULL;
@@ -72,36 +73,41 @@
const GHOST_TUns8 *GHOST_SystemPathsX11::getUserDir(int version, const char *versionstr) const
{
- static char user_path[PATH_MAX];
+ static string user_path = "";
/* in blender 2.64, we migrate to XDG. to ensure the copy previous settings
* operator works we give a different path depending on the requested version */
if (version < 264) {
- const char *home = getenv("HOME");
+ if (user_path.empty()) {
+ const char *home = getenv("HOME");
- if (home) {
- snprintf(user_path, sizeof(user_path), "%s/.blender/%s", home, versionstr);
- return (GHOST_TUns8 *)user_path;
+ if (home) {
+ user_path = string(home) + "/.blender/" + versionstr;
+ }
+ else {
+ return NULL;
+ }
}
-
- return NULL;
+ return (GHOST_TUns8 *)user_path.c_str();
}
else {
- const char *home = getenv("XDG_CONFIG_HOME");
+ if (user_path.empty()) {
+ const char *home = getenv("XDG_CONFIG_HOME");
- if (home) {
- snprintf(user_path, sizeof(user_path), "%s/blender/%s", home, versionstr);
- }
- else {
- home = getenv("HOME");
+ if (home) {
+ user_path = string(home) + "/blender/" + versionstr;
+ }
+ else {
+ home = getenv("HOME");
- if (home == NULL)
- home = getpwuid(getuid())->pw_dir;
+ if (home == NULL)
+ home = getpwuid(getuid())->pw_dir;
- snprintf(user_path, sizeof(user_path), "%s/.config/blender/%s", home, versionstr);
+ user_path = string(home) + "/.config/blender/" + versionstr;
+ }
}
- return (const GHOST_TUns8 *)user_path;
+ return (const GHOST_TUns8 *)user_path.c_str();
}
}
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py 2013-08-20 18:41:22 UTC (rev 59333)
@@ -1762,12 +1762,12 @@
self.report({'ERROR'}, "Failed to get addons path")
return {'CANCELLED'}
- # create dir is if missing.
- try:
- os.makedirs(path_addons, exist_ok=True)
- except:
- import traceback
- traceback.print_exc()
+ if not os.path.isdir(path_addons):
+ try:
+ os.makedirs(path_addons, exist_ok=True)
+ except:
+ import traceback
+ traceback.print_exc()
# Check if we are installing from a target path,
# doing so causes 2+ addons of same name or when the same from/to
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h 2013-08-20 18:41:22 UTC (rev 59333)
@@ -332,10 +332,10 @@
/* vertex level transformations & checks (no derived mesh) */
-int BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
-int BKE_mesh_center_median(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
+bool BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
+bool BKE_mesh_center_median(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
void BKE_mesh_translate(struct Mesh *me, const float offset[3], const bool do_keys);
/* mesh_validate.c */
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c 2013-08-20 18:41:22 UTC (rev 59333)
@@ -951,7 +951,6 @@
if (p >= len) return 0;
else p = p / len;
- curvemapping_initialize(br->curve);
strength = curvemapping_evaluateF(br->curve, 0, p);
CLAMP(strength, 0.0f, 1.0f);
@@ -967,7 +966,6 @@
else
p = p / len;
- curvemapping_initialize(br->curve);
return curvemapping_evaluateF(br->curve, 0, p);
}
@@ -1024,6 +1022,7 @@
int half = side / 2;
int i, j;
+ curvemapping_initialize(br->curve);
texcache = BKE_brush_gen_texture_cache(br, half);
im->rect_float = MEM_callocN(sizeof(float) * side * side, "radial control rect");
im->x = im->y = side;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-08-20 18:25:59 UTC (rev 59332)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-08-20 18:41:22 UTC (rev 59333)
@@ -3667,7 +3667,7 @@
/* basic vertex data functions */
-int BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
+bool BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3678,7 +3678,7 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_median(Mesh *me, float cent[3])
+bool BKE_mesh_center_median(Mesh *me, float cent[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3694,19 +3694,19 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_bounds(Mesh *me, float cent[3])
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list