[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59672] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Aug 30 21:32:19 CEST 2013
Revision: 59672
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59672
Author: gdh
Date: 2013-08-30 19:32:19 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59640 to r59671.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59640
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59671
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-cycles_mblur/intern/cycles/cmake/external_libs.cmake
branches/soc-2013-cycles_mblur/intern/cycles/render/image.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/sky_model.cpp
branches/soc-2013-cycles_mblur/intern/cycles/util/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_editmesh_bvh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_screen_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_bisect.c
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,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59639
+ /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,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59671
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-30 19:32:19 UTC (rev 59672)
@@ -262,6 +262,7 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-30 19:32:19 UTC (rev 59672)
@@ -27,7 +27,7 @@
link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
-if(WITH_CYCLES_STANDALONE)
+if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
list(APPEND LIBRARIES ${GLUT_LIBRARIES})
endif()
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp 2013-08-30 19:32:19 UTC (rev 59672)
@@ -29,7 +29,10 @@
#include "util_progress.h"
#include "util_string.h"
#include "util_time.h"
+
+#ifdef WITH_CYCLES_STANDALONE_GUI
#include "util_view.h"
+#endif
#include "cycles_xml.h"
@@ -100,8 +103,10 @@
if(options.session_params.background && !options.quiet)
options.session->progress.set_update_callback(function_bind(&session_print_status));
+#ifdef WITH_CYCLES_STANDALONE_GUI
else
options.session->progress.set_update_callback(function_bind(&view_redraw));
+#endif
options.session->start();
@@ -136,6 +141,7 @@
}
}
+#ifdef WITH_CYCLES_STANDALONE_GUI
static void display_info(Progress& progress)
{
static double latency = 0.0;
@@ -186,6 +192,7 @@
else if(key == 27) // escape
options.session->progress.set_cancel("Cancelled");
}
+#endif
static int files_parse(int argc, const char *argv[])
{
@@ -271,8 +278,14 @@
else if(ssname == "svm")
options.scene_params.shadingsystem = SceneParams::SVM;
- /* Progressive rendering */
- options.session_params.progressive = true;
+#ifdef WITH_CYCLES_STANDALONE_GUI
+ /* Progressive rendering for GUI */
+ if(!options.session_params.background)
+ options.session_params.progressive = true;
+#else
+ /* When building without GUI, set background */
+ options.session_params.background = true;
+#endif
/* find matching device */
DeviceType device_type = Device::type_from_string(devicename.c_str());
@@ -325,13 +338,15 @@
int main(int argc, const char **argv)
{
path_init();
-
options_parse(argc, argv);
-
+
+#ifdef WITH_CYCLES_STANDALONE_GUI
if(options.session_params.background) {
+#endif
session_init();
options.session->wait();
session_exit();
+#ifdef WITH_CYCLES_STANDALONE_GUI
}
else {
string title = "Cycles: " + path_filename(options.filepath);
@@ -340,6 +355,7 @@
view_main_loop(title.c_str(), options.width, options.height,
session_init, session_exit, resize, display, keyboard);
}
+#endif
return 0;
}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp 2013-08-30 19:32:19 UTC (rev 59672)
@@ -257,7 +257,7 @@
xml_read_bool(&branched, node, "branched");
if(branched)
- integrator->method == Integrator::BRANCHED_PATH;
+ integrator->method = Integrator::BRANCHED_PATH;
if(integrator->method == Integrator::BRANCHED_PATH) {
xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");
Modified: branches/soc-2013-cycles_mblur/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/cmake/external_libs.cmake 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/cmake/external_libs.cmake 2013-08-30 19:32:19 UTC (rev 59672)
@@ -2,7 +2,7 @@
###########################################################################
# GLUT
-if(WITH_CYCLES_STANDALONE)
+if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
set(GLUT_ROOT_PATH ${CYCLES_GLUT})
find_package(GLUT)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/image.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/image.cpp 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/image.cpp 2013-08-30 19:32:19 UTC (rev 59672)
@@ -127,10 +127,14 @@
is_linear = !(colorspace == "sRGB" ||
colorspace == "GammaCorrected" ||
- strcmp(in->format_name(), "png") == 0);
+ (colorspace == "" &&
+ (strcmp(in->format_name(), "png") == 0 ||
+ strcmp(in->format_name(), "tiff") == 0 ||
+ strcmp(in->format_name(), "jpeg2000") == 0)));
}
- else
+ else {
is_linear = false;
+ }
in->close();
}
@@ -303,7 +307,7 @@
}
/* we only handle certain number of components */
- if(!(components == 1 || components == 3 || components == 4)) {
+ if(!(components >= 1 && components <= 4)) {
if(in) {
in->close();
delete in;
@@ -330,8 +334,16 @@
builtin_image_pixels_cb(img->filename, img->builtin_data, pixels);
}
- if(components == 3) {
+ if(components == 2) {
for(int i = width*height-1; i >= 0; i--) {
+ pixels[i*4+3] = pixels[i*2+1];
+ pixels[i*4+2] = pixels[i*2+0];
+ pixels[i*4+1] = pixels[i*2+0];
+ pixels[i*4+0] = pixels[i*2+0];
+ }
+ }
+ else if(components == 3) {
+ for(int i = width*height-1; i >= 0; i--) {
pixels[i*4+3] = 255;
pixels[i*4+2] = pixels[i*3+2];
pixels[i*4+1] = pixels[i*3+1];
@@ -386,7 +398,7 @@
builtin_image_info_cb(img->filename, img->builtin_data, is_float, width, height, components);
}
- if(!(components == 1 || components == 3 || components == 4)) {
+ if(!(components >= 1 && components <= 4)) {
if(in) {
in->close();
delete in;
@@ -412,8 +424,16 @@
builtin_image_float_pixels_cb(img->filename, img->builtin_data, pixels);
}
- if(components == 3) {
+ if(components == 2) {
for(int i = width*height-1; i >= 0; i--) {
+ pixels[i*4+3] = pixels[i*2+1];
+ pixels[i*4+2] = pixels[i*2+0];
+ pixels[i*4+1] = pixels[i*2+0];
+ pixels[i*4+0] = pixels[i*2+0];
+ }
+ }
+ else if(components == 3) {
+ for(int i = width*height-1; i >= 0; i--) {
pixels[i*4+3] = 1.0f;
pixels[i*4+2] = pixels[i*3+2];
pixels[i*4+1] = pixels[i*3+1];
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp 2013-08-30 18:04:23 UTC (rev 59671)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp 2013-08-30 19:32:19 UTC (rev 59672)
@@ -464,6 +464,9 @@
float2 spherical = sky_spherical_coordinates(dir);
float theta = spherical.x;
float phi = spherical.y;
+
+ /* Clamp to Horizon */
+ theta = clamp(theta, 0.0f, M_PI_2_F);
sunsky->theta = theta;
sunsky->phi = phi;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/sky_model.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list