[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50502] branches/soc-2011-tomato: Merging r50484 through r50501 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Sep 10 12:58:59 CEST 2012
Revision: 50502
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50502
Author: nazgul
Date: 2012-09-10 10:58:59 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Merging r50484 through r50501 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50484
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50501
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake
branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/util/editmode_undo.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50483
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50501
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-09-10 10:58:59 UTC (rev 50502)
@@ -691,6 +691,31 @@
endif()
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
@@ -835,6 +860,31 @@
add_definitions(-D__SSE__ -D__MMX__)
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
if(MSVC)
set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
@@ -1475,6 +1525,31 @@
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
set(EXETYPE MACOSX_BUNDLE)
set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-09-10 10:58:59 UTC (rev 50502)
@@ -373,6 +373,9 @@
if(WITH_MOD_CLOTH_ELTOPO)
target_link_libraries(${target} ${LAPACK_LIBRARIES})
endif()
+ if(WITH_CYCLES_OSL)
+ target_link_libraries(${target} ${OSL_LIBRARIES})
+ endif()
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
Modified: branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake 2012-09-10 10:58:59 UTC (rev 50502)
@@ -18,32 +18,6 @@
endif()
###########################################################################
-# OpenShadingLanguage
-
-if(WITH_CYCLES_OSL)
-
- set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-
- message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
-
- find_library(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist)
- find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include ${CYCLES_OSL}/dist)
- find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${CYCLES_OSL}/dist)
-
- if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
- set(OSL_FOUND TRUE)
- message(STATUS "OSL includes = ${OSL_INCLUDES}")
- message(STATUS "OSL library = ${OSL_LIBRARIES}")
- message(STATUS "OSL compiler = ${OSL_COMPILER}")
- else()
- message(STATUS "OSL not found")
- endif()
-
- include_directories(${OSL_INCLUDES} ${OSL_INCLUDES}/OSL ${OSL_INCLUDES}/../../../src/liboslexec)
-
-endif()
-
-###########################################################################
# Partio
if(WITH_CYCLES_PARTIO)
Modified: branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt 2012-09-10 10:58:59 UTC (rev 50502)
@@ -43,7 +43,3 @@
add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
add_subdirectory(nodes)
-
-if(WITH_CYCLES_OSL)
- target_link_libraries(cycles_kernel_osl ${OSL_LIBRARIES})
-endif()
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py 2012-09-10 10:58:59 UTC (rev 50502)
@@ -104,12 +104,15 @@
file = ("".join((c if file_b[i] == c else "#")
for i, c in enumerate(file_a)))
+ del file_a, file_b, frame_tmp
+ file = bpy.path.abspath(file) # expand '//'
else:
# works for movies and images
file = rd.frame_path(frame=scene.frame_start)
+ file = bpy.path.abspath(file) # expand '//'
+ if not os.path.exists(file):
+ self.report({'WARNING'}, "File %r not found" % file)
- file = bpy.path.abspath(file) # expand '//'
-
cmd = [player_path]
# extra options, fps controls etc.
if preset in {'BLENDER24', 'INTERNAL'}:
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-09-10 10:58:59 UTC (rev 50502)
@@ -83,6 +83,8 @@
void set_blender_test_break_cb(void (*func)(void) );
int blender_test_break(void);
+#define BKE_UNDO_STR_MAX 64
+
/* global undo */
extern void BKE_write_undo(struct bContext *C, const char *name);
extern void BKE_undo_step(struct bContext *C, int step);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h 2012-09-10 10:58:59 UTC (rev 50502)
@@ -72,10 +72,12 @@
short selectmode;
short mat_nr;
- /*Mesh structure this editmesh came from, if it came from one*/
- struct Mesh *me;
+ /* Object this editmesh came from (if it came from one) */
struct Object *ob;
+ /* Unused for now, we could bring it back and assign in the same way 'ob' is */
+ // struct Mesh *me;
+
/*temp variables for x-mirror editing*/
int mirror_cdlayer; /* -1 is invalid */
int mirr_free_arrays;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-09-10 10:50:08 UTC (rev 50501)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-09-10 10:58:59 UTC (rev 50502)
@@ -924,7 +924,7 @@
/* simple preventing of too deep nested groups */
if (level > MAX_DUPLI_RECUR) return;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(par);
if (em) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list