Commit: 6d118968415866922d696bf8804659bbdad755dd
Author: Sergey Sharybin
Date: Mon Jun 16 14:45:17 2014 +0600
https://developer.blender.org/rB6d118968415866922d696bf8804659bbdad755dd
Backport revisions for blender-rc2
f95817c, b0708dd, 2b7ff6d, 1d982ea, 781de74,
871a8eb, db750b9, 6d4f062, f325ddb, 31e15b5,
be55327.
===================================================================
M build_files/cmake/buildinfo.cmake
M build_files/cmake/macros.cmake
M build_files/scons/tools/Blender.py
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemWin32.cpp
M release/darwin/codesigning_rules_blender.plist
M release/darwin/codesigning_rules_player.plist
M release/datafiles/locale
M release/datafiles/splash.png
M release/datafiles/splash_2x.png
M release/scripts/addons
M release/scripts/addons_contrib
M scons
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform_snap.c
M source/blender/render/extern/include/RE_bake.h
M source/blender/render/intern/source/bake_api.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/build_files/cmake/buildinfo.cmake
b/build_files/cmake/buildinfo.cmake
index c1d21c4..3660b3e 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -85,6 +85,10 @@ if(EXISTS ${SOURCE_DIR}/.git)
endif()
endif()
+ if(MY_WC_BRANCH MATCHES "^blender-v")
+ set(MY_WC_BRANCH "master")
+ endif()
+
unset(_git_below_check)
endif()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 772ff6d..bdd3883 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1006,7 +1006,7 @@ macro(msgfmt_simple
OUTPUT ${_file_to}
COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/msgfmt
${_file_from} ${_file_to}
- DEPENDS msgfmt)
+ DEPENDS msgfmt ${_file_from})
set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index 621a85a..ee35586 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -457,6 +457,9 @@ def buildinfo(lenv, build_type):
unpushed_log = os.popen('git log --oneline
@{u}..').read().strip()
has_local_changes = unpushed_log != ''
+ if build_branch.startswith('blender-v'):
+ build_branch = 'master'
+
if has_local_changes:
build_branch += ' (modified)'
else:
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index b7b1079..2e372d7 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1087,7 +1087,7 @@ GHOST_TUns8 GHOST_SystemCocoa::handleQuitRequest()
//Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState())
{
- int shouldQuit = NSRunAlertPanel(@"Exit Blender", @"Some
changes have not been saved.\nDo you really want to quit ?",
+ int shouldQuit = NSRunAlertPanel(@"Exit Blender", @"Some
changes have not been saved.\nDo you really want to quit?",
@"Cancel", @"Quit Anyway",
nil);
if (shouldQuit == NSAlertAlternateReturn)
{
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp
b/intern/ghost/intern/GHOST_SystemWin32.cpp
index b58dccf..9615f83 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1435,6 +1435,6 @@ int GHOST_SystemWin32::toggleConsole(int action)
int GHOST_SystemWin32::confirmQuit(GHOST_IWindow *window) const
{
- return (MessageBox(window ? ((GHOST_WindowWin32 *)window)->getHWND() :
0, "Some changes have not been saved.\nDo you really want to quit ?",
+ return (MessageBox(window ? ((GHOST_WindowWin32 *)window)->getHWND() :
0, "Some changes have not been saved.\nDo you really want to quit?",
"Exit Blender", MB_OKCANCEL | MB_ICONWARNING |
MB_TOPMOST) == IDOK);
}
diff --git a/release/darwin/codesigning_rules_blender.plist
b/release/darwin/codesigning_rules_blender.plist
index aa5580d..5e6198e 100644
--- a/release/darwin/codesigning_rules_blender.plist
+++ b/release/darwin/codesigning_rules_blender.plist
@@ -5,7 +5,7 @@
<key>rules</key>
<dict>
<!-- Exclude datafiles, python and scripts -->
- <key>^MacOS/2.70</key>
+ <key>^MacOS/2.71</key>
<false/>
<key>^Resources/</key>
<true/>
diff --git a/release/darwin/codesigning_rules_player.plist
b/release/darwin/codesigning_rules_player.plist
index ff154df..acbdab2 100644
--- a/release/darwin/codesigning_rules_player.plist
+++ b/release/darwin/codesigning_rules_player.plist
@@ -5,7 +5,7 @@
<key>rules</key>
<dict>
<!-- Exclude datafiles, python and scripts -->
- <key>^MacOS/2.70</key>
+ <key>^MacOS/2.71</key>
<false/>
<!-- Exclude Resources for placing game.blend and own icons -->
<key>^Resources/</key>
diff --git a/release/datafiles/locale b/release/datafiles/locale
index cb1967c..f3d1f81 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit cb1967cc63a6d2d75d2b59cdf91c5f5645285aea
+Subproject commit f3d1f8127094dc64eb889e41792fd4c2d877d5bb
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index aa2b634..4512737 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png
differ
diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png
index 32ef1aa..758178b 100644
Binary files a/release/datafiles/splash_2x.png and
b/release/datafiles/splash_2x.png differ
diff --git a/release/scripts/addons b/release/scripts/addons
index c50944e..9948cd6 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c50944e808d6c74148237e85866e893628f0fee6
+Subproject commit 9948cd6025f29fad12eaf6d3b0e738dfb2b50d4a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 31545d2..0bd307a 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 31545d25c9cb41d271a3f3ef84d327708572290e
+Subproject commit 0bd307ae8cc7746b433c0baf9be13dc662b47f08
diff --git a/scons b/scons
index 2d6ebcb..1ec9310 160000
--- a/scons
+++ b/scons
@@ -1 +1 @@
-Subproject commit 2d6ebcb23909058b846aa232ecb2fee497924cf8
+Subproject commit 1ec93106c40fab0c339d09c7ed9897c85ddf3da5
diff --git a/source/blender/editors/object/object_bake_api.c
b/source/blender/editors/object/object_bake_api.c
index de709a4..cdb23b2 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -738,9 +738,12 @@ static int bake(
ob_low->restrictflag |= OB_RESTRICT_RENDER;
/* populate the pixel arrays with the corresponding face data
for each high poly object */
- RE_bake_pixels_populate_from_objects(
- me_low, pixel_array_low, highpoly, tot_highpoly,
num_pixels, ob_cage != NULL,
- cage_extrusion, ob_low->obmat, (ob_cage ?
ob_cage->obmat : ob_low->obmat), me_cage);
+ if (!RE_bake_pixels_populate_from_objects(
+ me_low, pixel_array_low, highpoly, tot_highpoly,
num_pixels, ob_cage != NULL,
+ cage_extrusion, ob_low->obmat, (ob_cage ?
ob_cage->obmat : ob_low->obmat), me_cage)) {
+ BKE_report(reports, RPT_ERROR, "Error handling selected
objects");
+ goto cleanup;
+ }
/* the baking itself */
for (i = 0; i < tot_highpoly; i++) {
@@ -1264,8 +1267,8 @@ void OBJECT_OT_bake(wmOperatorType *ot)
"Extends the baked result as a post process filter", 0, 64);
RNA_def_boolean(ot->srna, "use_selected_to_active", false, "Selected to
Active",
"Bake shading on the surface of selected objects to the
active object");
- RNA_def_float(ot->srna, "cage_extrusion", 0.0, 0.0, 1.0, "Cage
Extrusion",
- "Distance to use for the inward ray cast when using
selected to active", 0.0, 1.0);
+ RNA_def_float(ot->srna, "cage_extrusion", 0.0f, 0.0f, FLT_MAX, "Cage
Extrusion",
+ "Distance to use for the inward ray cast when using
selected to active", 0.0f, 1.0f);
RNA_def_string(ot->srna, "cage_object", NULL, MAX_NAME, "Cage Object",
"Object to use as cage, instead of calculating the cage
from the active object with cage extrusion");
RNA_def_enum(ot->srna, "normal_space", normal_space_items,
R_BAKE_SPACE_TANGENT, "Normal Space",
diff --git a/source/blender/editors/space_view3d/view3d_view.c
b/source/blender/editors/space_view3d/view3d_view.c
index ef99e8d..eb40df8 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -815,7 +815,7 @@ void view3d_winmatrix_set(ARegion *ar, View3D *v3d, rctf
*rect)
rect->ymax /= (float)ar->winy;
rect->ymax = y1 + rect->ymax * (y2 - y1);
- if (is_ortho) wmOrtho(rect->xmin, rect->xmax, rect->ymin,
rect->ymax, -clipend, clipend);
+ if (is_ortho) wmOrtho(rect->xmin, rect->xmax, rect->ymin,
rect->ymax, clipsta, clipend);
else wmFrustum(rect->xmin, rect->xmax, rect->ymin, rect->ymax,
clipsta, clipend);
}
diff --git a/source/blender/editors/transform/transform_snap.c
b/source/blender/editors/transform/transform_snap.c
index 2da6b92..67a68a3 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -507,6 +507,7 @@ static void initSnappingMode(TransInfo *t)
if (t->tsnap.applySnap != NULL && // A snapping function
actually exist
(obedit != NULL && ELEM5(obedit->type, OB_MESH,
OB_ARMATURE, OB_CURVE, OB_LATTICE, OB_MBALL)) ) // Temporary limited to edit
mode meshes, armature, curves, mballs
{
+ BoundBox *bb_init;
/* Exclude editmesh if using proportional edit */
if ((obedit->type == OB_MESH) && (t->flag &
T_PROP_EDIT)) {
t->tsnap.modeSelect = SNAP_NOT_OBEDIT;
@@ -517,7 +518,9 @@ static void initSnappingMode(TransInfo *t)
/* store the original bounding box -
* we could slightly increase the size in screen space
but leaving as TODO */
- t->tsnap.BB_init = *BKE_object_boundbox_get(obedit);
+ bb_init = BKE_object_boundbox_get(obedit);
+ if (bb_init)
+ t->tsnap.BB_init = *bb_init;
}
/* Particles edit mode*/
else if (t->tsnap.applySnap != NULL && // A snapping function
actually exist
diff --git a/source/blender/render/extern/include/RE_bake.h
b/source/blender/render/extern/include/RE_bake.h
index 4727aef..961ca3f 100644
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/extern/include/RE_bake.h
@@ -80,7 +80,7 @@ bool RE_bake_internal(
struct Render *re, struct Object *object, const BakePixel
pixel_array[],
const int num_pixels, const int depth, const ScenePassType pass_type,
float result[]);
-void RE_bake_pixels_populate_from_objects(
+bool RE_bake_pixels_populate_from_objects(
struct Mesh *me_low, BakePixel pixel_array_from[],
BakeHighPolyData highpoly[], const int tot_highpoly, const int
num_pixels, const bool is_custom_cage,
const float cage_extrusion, float mat_low[4][4], float mat_cage[4][4],
struct Mesh *me_cage);
diff --git a/source/blender/render/intern/source/bake_ap
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
