[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43212] branches/asset-browser: Asset-Browser Branch:

Thomas Dinges blender at dingto.org
Sat Jan 7 17:14:23 CET 2012


Revision: 43212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43212
Author:   dingto
Date:     2012-01-07 16:14:17 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Asset-Browser Branch:
* Merge in changes from Trunk, svn  43110-43211

Modified Paths:
--------------
    branches/asset-browser/CMakeLists.txt
    branches/asset-browser/build_files/scons/config/win32-mingw-config.py
    branches/asset-browser/build_files/scons/config/win32-vc-config.py
    branches/asset-browser/build_files/scons/config/win64-vc-config.py
    branches/asset-browser/doc/python_api/examples/bpy.types.Operator.4.py
    branches/asset-browser/doc/python_api/examples/bpy.types.Operator.5.py
    branches/asset-browser/doc/python_api/rst/info_best_practice.rst
    branches/asset-browser/doc/python_api/rst/info_quickstart.rst
    branches/asset-browser/doc/python_api/rst/info_tips_and_tricks.rst
    branches/asset-browser/intern/cycles/app/cycles_server.cpp
    branches/asset-browser/intern/cycles/app/cycles_test.cpp
    branches/asset-browser/intern/cycles/blender/blender_session.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.cpp
    branches/asset-browser/intern/cycles/device/device.cpp
    branches/asset-browser/intern/cycles/device/device.h
    branches/asset-browser/intern/cycles/device/device_cpu.cpp
    branches/asset-browser/intern/cycles/device/device_cuda.cpp
    branches/asset-browser/intern/cycles/device/device_intern.h
    branches/asset-browser/intern/cycles/device/device_memory.h
    branches/asset-browser/intern/cycles/device/device_multi.cpp
    branches/asset-browser/intern/cycles/device/device_network.cpp
    branches/asset-browser/intern/cycles/device/device_opencl.cpp
    branches/asset-browser/intern/cycles/render/buffers.cpp
    branches/asset-browser/intern/cycles/render/session.cpp
    branches/asset-browser/intern/cycles/render/session.h
    branches/asset-browser/intern/cycles/render/tile.cpp
    branches/asset-browser/release/scripts/startup/bl_operators/clip.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_render.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_logic.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_node.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
    branches/asset-browser/source/blender/blenfont/intern/blf.c
    branches/asset-browser/source/blender/blenfont/intern/blf_glyph.c
    branches/asset-browser/source/blender/blenkernel/BKE_sound.h
    branches/asset-browser/source/blender/blenkernel/intern/constraint.c
    branches/asset-browser/source/blender/blenkernel/intern/depsgraph.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh.c
    branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
    branches/asset-browser/source/blender/blenkernel/intern/seqeffects.c
    branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
    branches/asset-browser/source/blender/blenkernel/intern/sound.c
    branches/asset-browser/source/blender/blenkernel/intern/tracking.c
    branches/asset-browser/source/blender/blenloader/intern/readfile.c
    branches/asset-browser/source/blender/editors/animation/anim_filter.c
    branches/asset-browser/source/blender/editors/interface/interface_draw.c
    branches/asset-browser/source/blender/editors/interface/interface_templates.c
    branches/asset-browser/source/blender/editors/object/object_edit.c
    branches/asset-browser/source/blender/editors/screen/screen_ops.c
    branches/asset-browser/source/blender/editors/screen/screendump.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_snap.c
    branches/asset-browser/source/blender/imbuf/IMB_imbuf.h
    branches/asset-browser/source/blender/imbuf/intern/anim_movie.c
    branches/asset-browser/source/blender/imbuf/intern/divers.c
    branches/asset-browser/source/blender/makesdna/DNA_constraint_types.h
    branches/asset-browser/source/blender/makesdna/DNA_modifier_types.h
    branches/asset-browser/source/blender/makesrna/RNA_enum_types.h
    branches/asset-browser/source/blender/makesrna/intern/rna_constraint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_modifier.c
    branches/asset-browser/source/blender/makesrna/intern/rna_property.c
    branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
    branches/asset-browser/source/blender/makesrna/intern/rna_screen.c
    branches/asset-browser/source/blender/makesrna/intern/rna_tracking.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_uvproject.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_wave.c
    branches/asset-browser/source/blender/nodes/composite/node_composite_util.c
    branches/asset-browser/source/blender/python/intern/bpy_rna.c
    branches/asset-browser/source/blender/render/CMakeLists.txt
    branches/asset-browser/source/blender/render/extern/include/RE_pipeline.h
    branches/asset-browser/source/blender/render/intern/include/renderpipeline.h
    branches/asset-browser/source/blender/render/intern/source/external_engine.c
    branches/asset-browser/source/blender/render/intern/source/pipeline.c
    branches/asset-browser/source/blender/render/intern/source/rayshade.c
    branches/asset-browser/source/blender/render/intern/source/rendercore.c
    branches/asset-browser/source/blender/render/intern/source/zbuf.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_event_system.c
    branches/asset-browser/source/creator/creator.c
    branches/asset-browser/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_FontObject.cpp

Added Paths:
-----------
    branches/asset-browser/source/blender/render/intern/include/render_result.h
    branches/asset-browser/source/blender/render/intern/source/render_result.c

Property Changed:
----------------
    branches/asset-browser/
    branches/asset-browser/source/blender/editors/space_outliner/


Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:43077-43109
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:43077-43211

Modified: branches/asset-browser/CMakeLists.txt
===================================================================
--- branches/asset-browser/CMakeLists.txt	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/CMakeLists.txt	2012-01-07 16:14:17 UTC (rev 43212)
@@ -270,8 +270,8 @@
 	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
 endif()
 
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
-	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
 endif()
 
 # python module, needs some different options
@@ -711,8 +711,8 @@
 
 		add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
 
-		set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
-		set(CMAKE_C_FLAGS   "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_C_FLAGS   "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
 
 		if(CMAKE_CL_64)
 			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -1026,9 +1026,13 @@
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
-
+		
 		set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
 
+		## DISABLE - causes linking errors 
+		## for re-distrobution, so users dont need mingw installed
+		# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
+
 	endif()
 
 	# used in many places so include globally, like OpenGL

Modified: branches/asset-browser/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/asset-browser/build_files/scons/config/win32-mingw-config.py	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/build_files/scons/config/win32-mingw-config.py	2012-01-07 16:14:17 UTC (rev 43212)
@@ -190,6 +190,10 @@
 
 PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
 
+## DISABLED, causes linking errors!
+## for re-distrobution, so users dont need mingw installed
+# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
+
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
 

Modified: branches/asset-browser/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/asset-browser/build_files/scons/config/win32-vc-config.py	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/build_files/scons/config/win32-vc-config.py	2012-01-07 16:14:17 UTC (rev 43212)
@@ -185,7 +185,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
 

Modified: branches/asset-browser/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/asset-browser/build_files/scons/config/win64-vc-config.py	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/build_files/scons/config/win64-vc-config.py	2012-01-07 16:14:17 UTC (rev 43212)
@@ -190,7 +190,7 @@
 CXX = 'cl.exe'
 
 CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 

Modified: branches/asset-browser/doc/python_api/examples/bpy.types.Operator.4.py
===================================================================
--- branches/asset-browser/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-07 16:14:17 UTC (rev 43212)
@@ -22,7 +22,7 @@
     my_string = bpy.props.StringProperty(name="String Value")
 
     def execute(self, context):
-        print()
+        print("Test", self)
         return {'FINISHED'}
 
     def invoke(self, context, event):

Modified: branches/asset-browser/doc/python_api/examples/bpy.types.Operator.5.py
===================================================================
--- branches/asset-browser/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-07 16:14:17 UTC (rev 43212)
@@ -31,6 +31,7 @@
 
     def execute(self, context):
         context.object.location.x = self.value / 100.0
+        return {'FINISHED'}
 
     def modal(self, context, event):
         if event.type == 'MOUSEMOVE':  # Apply

Modified: branches/asset-browser/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_best_practice.rst	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/doc/python_api/rst/info_best_practice.rst	2012-01-07 16:14:17 UTC (rev 43212)
@@ -2,9 +2,9 @@
 Best Practice
 *************
 
-When writing you're own scripts python is great for new developers to pick up and become productive, but you can also pick up odd habits or at least write scripts that are not easy for others to understand.
+When writing your own scripts python is great for new developers to pick up and become productive, but you can also pick up odd habits or at least write scripts that are not easy for others to understand.
 
-For you're own work this is of course fine, but if you want to collaborate with others or have you're work included with blender there are practices we encourage.
+For your own work this is of course fine, but if you want to collaborate with others or have your work included with blender there are practices we encourage.
 
 
 Style Conventions
@@ -83,7 +83,7 @@
 
 Modifying Lists
 ^^^^^^^^^^^^^^^
-In python we can add and remove from a list, This is slower when the list length is modifier, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
+In python we can add and remove from a list, This is slower when the list length is modified, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
 
 The most simple way to add onto the end of the list is to use ``my_list.append(list_item)`` or ``my_list.extend(some_list)`` and the fastest way to remove an item is ``my_list.pop()`` or ``del my_list[-1]``.
 
@@ -244,7 +244,7 @@
 Checking String Start/End
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If your checking the start of a string for a keyword, rather than...
+If you're checking the start of a string for a keyword, rather than...
 
 >>> if line[0:5] == "vert ": ...
 
@@ -279,8 +279,8 @@
 In cases where you know you are checking for the same value which is referenced from multiple places, ``is`` is faster.
 
 
-Time You're Code
-----------------
+Time Your Code
+--------------
 
 While developing a script its good to time it to be aware of any changes in performance, this can be done simply.
 

Modified: branches/asset-browser/doc/python_api/rst/info_quickstart.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_quickstart.rst	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/doc/python_api/rst/info_quickstart.rst	2012-01-07 16:14:17 UTC (rev 43212)
@@ -262,8 +262,7 @@
 
 #. Click on the button **Run Script**.
 
-#. Move you're mouse into the 3D view, press spacebar for the operator search
-   menu, and type "Simple".
+#. Move your mouse into the 3D view, press spacebar for the operator search menu, and type "Simple".
 
 #. Click on the "Simple Operator" item found in search.
 

Modified: branches/asset-browser/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_tips_and_tricks.rst	2012-01-07 15:56:33 UTC (rev 43211)
+++ branches/asset-browser/doc/python_api/rst/info_tips_and_tricks.rst	2012-01-07 16:14:17 UTC (rev 43212)
@@ -16,7 +16,7 @@
 
 There are 3 main uses for the terminal, these are:
 
-* You can see the output of ``print()`` as you're script runs, which is useful to view debug info.
+* You can see the output of ``print()`` as your script runs, which is useful to view debug info.
 
 * The error trace-back is printed in full to the terminal which won't always generate an error popup in blender's user interface (depending on how the script is executed).
 
@@ -135,15 +135,15 @@
 * if the results can be displayed as text - print them or write them to a file.
 
 

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list