[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59549] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Tue Aug 27 10:13:55 CEST 2013
Revision: 59549
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59549
Author: gdh
Date: 2013-08-27 08:13:54 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59507 to r59548.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59507
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59548
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/cmake/external_libs.cmake
branches/soc-2013-cycles_mblur/intern/cycles/util/CMakeLists.txt
branches/soc-2013-cycles_mblur/release/scripts/modules/rna_info.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/__init__.py
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/blender.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/displist.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/group.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/property.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sca.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/listbase.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/undofile.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_mblur/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mask.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_uvedit.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_view2d.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/view2d.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filesel.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/space_file.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/space_image.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_access.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_rna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/creator/creator.c
branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/mask.py
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_test.cpp
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
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-59506
+ /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-59548
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-27 02:37:48 UTC (rev 59548)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-08-27 08:13:54 UTC (rev 59549)
@@ -261,7 +261,7 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
-option(WITH_CYCLES_TEST "Build cycles test application" OFF)
+option(WITH_CYCLES_STANDALONE "Build cycles standalone application" 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")
@@ -373,7 +373,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-27 02:37:48 UTC (rev 59548)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-27 08:13:54 UTC (rev 59549)
@@ -802,6 +802,7 @@
endmacro()
+# XXX Not used for now...
macro(svg_to_png
file_from
file_to
@@ -818,6 +819,15 @@
mark_as_advanced(INKSCAPE_EXE)
if(INKSCAPE_EXE)
+ if(APPLE)
+ # in OS X app bundle, the binary is a shim that doesn't take any
+ # command line arguments, replace it with the actual binary
+ string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
+ if(EXISTS "${INKSCAPE_REAL_EXE}")
+ set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
+ endif()
+ endif()
+
add_custom_command(
OUTPUT ${_file_to}
COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
@@ -830,4 +840,4 @@
unset(_file_from)
unset(_file_to)
-endmacro()
\ No newline at end of file
+endmacro()
Modified: branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt 2013-08-27 02:37:48 UTC (rev 59548)
+++ branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt 2013-08-27 08:13:54 UTC (rev 59549)
@@ -76,7 +76,7 @@
add_subdirectory(blender)
endif()
-if(WITH_CYCLES_TEST OR WITH_CYCLES_NETWORK)
+if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK)
add_subdirectory(app)
endif()
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-27 02:37:48 UTC (rev 59548)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/CMakeLists.txt 2013-08-27 08:13:54 UTC (rev 59549)
@@ -27,7 +27,7 @@
link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
-if(WITH_CYCLES_TEST)
+if(WITH_CYCLES_STANDALONE)
list(APPEND LIBRARIES ${GLUT_LIBRARIES})
endif()
@@ -38,17 +38,17 @@
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
-if(WITH_CYCLES_TEST)
+if(WITH_CYCLES_STANDALONE)
set(SRC
- cycles_test.cpp
+ cycles_standalone.cpp
cycles_xml.cpp
cycles_xml.h
)
- add_executable(cycles_test ${SRC})
- target_link_libraries(cycles_test ${LIBRARIES})
+ add_executable(cycles ${SRC})
+ target_link_libraries(cycles ${LIBRARIES})
if(UNIX AND NOT APPLE)
- set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+ set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
endif()
unset(SRC)
endif()
Copied: branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp (from rev 59548, trunk/blender/intern/cycles/app/cycles_standalone.cpp)
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp (rev 0)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_standalone.cpp 2013-08-27 08:13:54 UTC (rev 59549)
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include <stdio.h>
+
+#include "buffers.h"
+#include "camera.h"
+#include "device.h"
+#include "scene.h"
+#include "session.h"
+
+#include "util_args.h"
+#include "util_foreach.h"
+#include "util_function.h"
+#include "util_path.h"
+#include "util_progress.h"
+#include "util_string.h"
+#include "util_time.h"
+#include "util_view.h"
+
+#include "cycles_xml.h"
+
+CCL_NAMESPACE_BEGIN
+
+struct Options {
+ Session *session;
+ Scene *scene;
+ string filepath;
+ int width, height;
+ SceneParams scene_params;
+ SessionParams session_params;
+ bool quiet;
+} options;
+
+static void session_print(const string& str)
+{
+ /* print with carriage return to overwrite previous */
+ printf("\r%s", str.c_str());
+
+ /* add spaces to overwrite longer previous print */
+ static int maxlen = 0;
+ int len = str.size();
+ maxlen = max(len, maxlen);
+
+ for(int i = len; i < maxlen; i++)
+ printf(" ");
+
+ /* flush because we don't write an end of line */
+ fflush(stdout);
+}
+
+static void session_print_status()
+{
+ int sample, tile;
+ double total_time, sample_time;
+ string status, substatus;
+
+ /* get status */
+ sample = options.session->progress.get_sample();
+ options.session->progress.get_tile(tile, total_time, sample_time);
+ options.session->progress.get_status(status, substatus);
+
+ if(substatus != "")
+ status += ": " + substatus;
+
+ /* print status */
+ status = string_printf("Sample %d %s", sample, status.c_str());
+ session_print(status);
+}
+
+static BufferParams& session_buffer_params()
+{
+ static BufferParams buffer_params;
+ buffer_params.width = options.width;
+ buffer_params.height = options.height;
+ buffer_params.full_width = options.width;
+ buffer_params.full_height = options.height;
+
+ return buffer_params;
+}
+
+static void session_init()
+{
+ options.session = new Session(options.session_params);
+ options.session->reset(session_buffer_params(), options.session_params.samples);
+ options.session->scene = options.scene;
+
+ if(options.session_params.background && !options.quiet)
+ options.session->progress.set_update_callback(function_bind(&session_print_status));
+ else
+ options.session->progress.set_update_callback(function_bind(&view_redraw));
+
+ options.session->start();
+
+ options.scene = NULL;
+}
+
+static void scene_init(int width, int height)
+{
+ options.scene = new Scene(options.scene_params, options.session_params.device);
+ xml_read_file(options.scene, options.filepath.c_str());
+
+ if (width == 0 || height == 0) {
+ options.width = options.scene->camera->width;
+ options.height = options.scene->camera->height;
+ }
+}
+
+static void session_exit()
+{
+ if(options.session) {
+ delete options.session;
+ options.session = NULL;
+ }
+ if(options.scene) {
+ delete options.scene;
+ options.scene = NULL;
+ }
+
+ if(options.session_params.background && !options.quiet) {
+ session_print("Finished Rendering.");
+ printf("\n");
+ }
+}
+
+static void display_info(Progress& progress)
+{
+ static double latency = 0.0;
+ static double last = 0;
+ double elapsed = time_dt();
+ string str;
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list