[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41628] branches/cycles: Cycles: svn merge -r41613:41627 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Nov 7 18:13:32 CET 2011
Revision: 41628
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41628
Author: blendix
Date: 2011-11-07 17:13:32 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Cycles: svn merge -r41613:41627 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41613
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/build_files/cmake/config/blender_lite.cmake
branches/cycles/intern/cycles/blender/addon/engine.py
branches/cycles/intern/cycles/blender/blender_python.cpp
branches/cycles/release/scripts/startup/bl_ui/space_filebrowser.py
branches/cycles/source/blender/blenkernel/intern/depsgraph.c
branches/cycles/source/blender/blenkernel/intern/movieclip.c
branches/cycles/source/blender/blenkernel/intern/scene.c
branches/cycles/source/blender/blenkernel/intern/tracking.c
branches/cycles/source/blender/blenlib/intern/bpath.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/screen/area.c
branches/cycles/source/blender/editors/space_buttons/buttons_ops.c
branches/cycles/source/blender/editors/space_clip/clip_draw.c
branches/cycles/source/blender/editors/space_clip/clip_editor.c
branches/cycles/source/blender/editors/space_clip/tracking_ops.c
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/imbuf/CMakeLists.txt
branches/cycles/source/blender/imbuf/intern/IMB_filetype.h
branches/cycles/source/blender/imbuf/intern/filetype.c
branches/cycles/source/blender/imbuf/intern/readimage.c
branches/cycles/source/blender/imbuf/intern/util.c
branches/cycles/source/blender/imbuf/intern/writeimage.c
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesrna/intern/rna_render.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_texture_api.c
branches/cycles/source/blender/makesrna/intern/rna_tracking.c
branches/cycles/source/blender/makesrna/intern/rna_ui_api.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/render/extern/include/RE_engine.h
branches/cycles/source/blender/render/intern/source/external_engine.c
branches/cycles/source/blender/windowmanager/intern/wm_files.c
branches/cycles/source/creator/CMakeLists.txt
Removed Paths:
-------------
branches/cycles/source/blender/imbuf/intern/openimageio.cpp
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41613
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41627
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/CMakeLists.txt 2011-11-07 17:13:32 UTC (rev 41628)
@@ -105,7 +105,6 @@
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
-set(INCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
# Set default config options
@@ -300,10 +299,6 @@
set(WITH_BOOST ON)
endif()
-if(WITH_OPENIMAGEIO)
- set(WITH_BOOST ON)
-endif()
-
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
@@ -512,12 +507,7 @@
endif()
if(WITH_BOOST)
- if(CYCLES_BOOST)
- set(BOOST ${CYCLES_BOOST} CACHE PATH "Boost Directory")
- unset(CYCLES_BOOST CACHE)
- else()
- set(BOOST "/usr" CACHE PATH "Boost Directory")
- endif()
+ set(BOOST "/usr" CACHE PATH "Boost Directory")
if(NOT BOOST_CUSTOM)
set(BOOST_ROOT ${BOOST})
@@ -532,13 +522,8 @@
endif()
if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
- # temp, update
- if(CYCLES_OIIO)
- set(OPENIMAGEIO ${CYCLES_OIIO})
- unset(CYCLES_OIIO CACHE)
- endif()
-
set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
find_package(OpenImageIO REQUIRED)
@@ -549,7 +534,6 @@
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
endif()
-
endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
@@ -1511,6 +1495,7 @@
info_cfg_option(WITH_FFTW3)
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
+ info_cfg_option(WITH_CYCLES)
info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO)
@@ -1530,7 +1515,6 @@
info_cfg_option(WITH_IMAGE_OPENJPEG)
info_cfg_option(WITH_IMAGE_REDCODE)
info_cfg_option(WITH_IMAGE_TIFF)
- info_cfg_option(WITH_OPENIMAGEIO)
info_cfg_text("Audio:")
info_cfg_option(WITH_OPENAL)
Modified: branches/cycles/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/cycles/build_files/cmake/config/blender_lite.cmake 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/build_files/cmake/config/blender_lite.cmake 2011-11-07 17:13:32 UTC (rev 41628)
@@ -12,7 +12,9 @@
set(WITH_BULLET OFF CACHE FORCE BOOL)
set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
+set(WITH_CYCLES OFF CACHE FORCE BOOL)
set(WITH_FFTW3 OFF CACHE FORCE BOOL)
+set(WITH_LIBMV OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
Property changes on: branches/cycles/intern
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/intern:36353-41613
/trunk/intern:37695-37700
+ /trunk/blender/intern:36353-41627
/trunk/intern:37695-37700
Modified: branches/cycles/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/engine.py 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/intern/cycles/blender/addon/engine.py 2011-11-07 17:13:32 UTC (rev 41628)
@@ -19,16 +19,16 @@
import bpy
def init():
- import libcycles_blender as lib
+ import bcycles
import os.path
path = os.path.dirname(__file__)
user_path = os.path.dirname(os.path.abspath(bpy.utils.user_resource('CONFIG', '')))
- lib.init(path, user_path)
+ bcycles.init(path, user_path)
def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0):
- import libcycles_blender as lib
+ import bcycles
data = data.as_pointer()
scene = scene.as_pointer()
@@ -39,36 +39,36 @@
if rv3d:
rv3d = rv3d.as_pointer()
- engine.session = lib.create(engine.as_pointer(), data, scene, region, v3d, rv3d)
+ engine.session = bcycles.create(engine.as_pointer(), data, scene, region, v3d, rv3d)
def free(engine):
if "session" in dir(engine):
if engine.session:
- import libcycles_blender as lib
- lib.free(engine.session)
+ import bcycles
+ bcycles.free(engine.session)
del engine.session
def render(engine):
- import libcycles_blender as lib
- lib.render(engine.session)
+ import bcycles
+ bcycles.render(engine.session)
def update(engine, data, scene):
- import libcycles_blender as lib
- lib.sync(engine.session)
+ import bcycles
+ bcycles.sync(engine.session)
def draw(engine, region, v3d, rv3d):
- import libcycles_blender as lib
+ import bcycles
v3d = v3d.as_pointer()
rv3d = rv3d.as_pointer()
# draw render image
- lib.draw(engine.session, v3d, rv3d)
+ bcycles.draw(engine.session, v3d, rv3d)
def available_devices():
- import libcycles_blender as lib
- return lib.available_devices()
+ import bcycles
+ return bcycles.available_devices()
def with_osl():
- import libcycles_blender as lib
- return lib.with_osl()
+ import bcycles
+ return bcycles.with_osl()
Modified: branches/cycles/intern/cycles/blender/blender_python.cpp
===================================================================
--- branches/cycles/intern/cycles/blender/blender_python.cpp 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/intern/cycles/blender/blender_python.cpp 2011-11-07 17:13:32 UTC (rev 41628)
@@ -194,8 +194,8 @@
static struct PyModuleDef module = {
PyModuleDef_HEAD_INIT,
- "libcycles_blender",
- "Blender RNA to render exporter",
+ "bcycles",
+ "Blender cycles render integration",
-1,
methods,
NULL, NULL, NULL, NULL
Property changes on: branches/cycles/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:36353-41613
/trunk/release:37695-37700
+ /trunk/blender/release:36353-41627
/trunk/release:37695-37700
Modified: branches/cycles/release/scripts/startup/bl_ui/space_filebrowser.py
===================================================================
--- branches/cycles/release/scripts/startup/bl_ui/space_filebrowser.py 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/release/scripts/startup/bl_ui/space_filebrowser.py 2011-11-07 17:13:32 UTC (rev 41628)
@@ -62,7 +62,7 @@
row.prop(params, "use_filter_folder", text="")
if params.filter_glob:
- #if st.operator and hasattr(st.operator, "filter_glob"):
+ #if st.active_operator and hasattr(st.active_operator, "filter_glob"):
# row.prop(params, "filter_glob", text="")
row.label(params.filter_glob)
else:
Modified: branches/cycles/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/cycles/source/blender/blenkernel/intern/depsgraph.c 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/source/blender/blenkernel/intern/depsgraph.c 2011-11-07 17:13:32 UTC (rev 41628)
@@ -592,7 +592,10 @@
if(part->ren_as == PART_DRAW_OB && part->dup_ob) {
node2 = dag_get_node(dag, part->dup_ob);
- dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Particle Object Visualisation");
+ /* note that this relation actually runs in the wrong direction, the problem
+ is that dupli system all have this (due to parenting), and the render
+ engine instancing assumes particular ordering of objects in list */
+ dag_add_relation(dag, node, node2, DAG_RL_OB_OB, "Particle Object Visualisation");
if(part->dup_ob->type == OB_MBALL)
dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA, "Particle Object Visualisation");
}
Modified: branches/cycles/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/cycles/source/blender/blenkernel/intern/movieclip.c 2011-11-07 17:07:54 UTC (rev 41627)
+++ branches/cycles/source/blender/blenkernel/intern/movieclip.c 2011-11-07 17:13:32 UTC (rev 41628)
@@ -156,13 +156,10 @@
autoguess offset for now. could be something smarter in the future */
offset= sequence_guess_offset(clip->name, strlen(head), numlen);
- if(numlen) BLI_stringenc(name, head, tail, numlen, offset+framenr-1);
- else strncpy(name, clip->name, sizeof(name));
+ if (numlen) BLI_stringenc(name, head, tail, numlen, offset+framenr-1);
+ else BLI_strncpy(name, clip->name, sizeof(clip->name));
- if(clip->id.lib)
- BLI_path_abs(name, clip->id.lib->filepath);
- else
- BLI_path_abs(name, G.main->name);
+ BLI_path_abs(name, ID_BLEND_PATH(G.main, &clip->id));
}
/* supposed to work with sequences only */
@@ -174,7 +171,7 @@
BLI_split_dirfile(clip->name, clipdir, clipfile, FILE_MAX, FILE_MAX);
if(clip->flag&MCLIP_USE_PROXY_CUSTOM_DIR) {
- strcpy(dir, clip->proxy.dir);
+ BLI_strncpy(dir, clip->proxy.dir, sizeof(dir));
} else {
BLI_snprintf(dir, FILE_MAX, "%s/BL_proxy", clipdir);
}
@@ -194,9 +191,9 @@
{
struct ImBuf *ibuf;
char name[FILE_MAX];
- int loadflag, size, undistort;
+ int loadflag /*, size */ /* UNUSED */, undistort;
- size= rendersize_to_number(user->render_size);
+ /* size= rendersize_to_number(user->render_size); */
undistort= user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT;
@@ -222,19 +219,15 @@
if(!clip->anim) {
BLI_strncpy(str, clip->name, FILE_MAX);
+ BLI_path_abs(str, ID_BLEND_PATH(G.main, &clip->id));
- if(clip->id.lib)
- BLI_path_abs(str, clip->id.lib->filepath);
- else
- BLI_path_abs(str, G.main->name);
-
/* FIXME: make several stream accessible in image editor, too */
clip->anim= openanim(str, IB_rect, 0);
if(clip->anim) {
if(clip->flag&MCLIP_USE_PROXY_CUSTOM_DIR) {
char dir[FILE_MAX];
- strcpy(dir, clip->proxy.dir);
+ BLI_strncpy(dir, clip->proxy.dir, sizeof(dir));
BLI_path_abs(dir, G.main->name);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list