[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59009] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Thu Aug 8 07:19:48 CEST 2013


Revision: 59009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59009
Author:   gdh
Date:     2013-08-08 05:19:47 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58985 to r59008.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58985
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59008

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/CMakeLists.txt
    branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_smatch.py
    branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2013-cycles_mblur/build_files/cmake/project_source_info.py
    branches/soc-2013-cycles_mblur/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/3dsmax.py
    branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_image.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/action.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_group.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
    branches/soc-2013-cycles_mblur/source/blender/render/intern/include/zbuf.h
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Camera.h

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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58984
   + /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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59008

Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-08-08 05:19:47 UTC (rev 59009)
@@ -416,6 +416,10 @@
 	set(WITH_HEADLESS ON)
 endif()
 
+if(NOT WITH_PYTHON)
+	set(WITH_CYCLES OFF)
+endif()
+
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_smatch.py	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_smatch.py	2013-08-08 05:19:47 UTC (rev 59009)
@@ -44,6 +44,7 @@
 
 def main():
     source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
@@ -52,7 +53,8 @@
                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
+               [("-D%s" % d) for d in defs] +
+               source_defines
                )
 
         check_commands.append((c, cmd))

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_sparse.py	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_sparse.py	2013-08-08 05:19:47 UTC (rev 59009)
@@ -42,6 +42,7 @@
 
 def main():
     source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
@@ -50,7 +51,8 @@
                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
+               [("-D%s" % d) for d in defs] +
+               source_defines
                )
 
         check_commands.append((c, cmd))

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/project_source_info.py	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/project_source_info.py	2013-08-08 05:19:47 UTC (rev 59009)
@@ -171,6 +171,26 @@
     return source
 
 
+def build_defines_as_source():
+    """
+    Returns a string formatted as an include:
+        '#defines A=B\n#define....'
+    """
+    import subprocess
+    # works for both gcc and clang
+    cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+    return subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,
+                            stdin=subprocess.DEVNULL,
+                            ).stdout.read().strip().decode('ascii')
+
+
+def build_defines_as_args():
+    return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+            for l in build_defines_as_source().split("\n")
+            if l.startswith('#define')]
+
+
 # could be moved elsewhere!, this just happens to be used by scripts that also
 # use this module.
 def queue_processes(process_funcs, job_total=-1):

Modified: branches/soc-2013-cycles_mblur/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
===================================================================
--- branches/soc-2013-cycles_mblur/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst	2013-08-08 05:19:47 UTC (rev 59009)
@@ -27,6 +27,12 @@
 
       :type: float
 
+   .. attribute:: fov
+
+      The camera's field of view value.
+
+      :type: float
+
    .. attribute:: ortho_scale
 
       The camera's view scale when in orthographic mode.

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-08 05:19:47 UTC (rev 59009)
@@ -471,32 +471,41 @@
 
 	bool hair_present = false;
 	bool show_emitter = false;
-	bool hide = false;
+	bool hide_as_dupli_parent = false;
+	bool hide_as_dupli_child_original = false;
 
 	for(b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
 		if((b_psys->settings().render_type() == BL::ParticleSettings::render_type_PATH) &&
 		   (b_psys->settings().type()==BL::ParticleSettings::type_HAIR))
 			hair_present = true;
 
-		if(b_psys->settings().use_render_emitter()) {
-			hide = false;
+		if(b_psys->settings().use_render_emitter())
 			show_emitter = true;
-		}
 	}
 
 	/* duplicators hidden by default, except dupliframes which duplicate self */
 	if(b_ob.is_duplicator())
 		if(top_level || b_ob.dupli_type() != BL::Object::dupli_type_FRAMES)
-			hide = true;
+			hide_as_dupli_parent = true;
 
 	/* hide original object for duplis */
 	BL::Object parent = b_ob.parent();
 	if(parent && object_render_hide_original(b_ob.type(), parent.dupli_type()))
 		if(parent_hide)
-			hide = true;
-
-	hide_triangles = (hair_present && !show_emitter);
-	return hide && !show_emitter;
+			hide_as_dupli_child_original = true;
+	
+	if(show_emitter) {
+		hide_triangles = false;
+		return (hide_as_dupli_parent || hide_as_dupli_child_original);
+	}
+	else if(hair_present) {
+		hide_triangles = true;
+		return hide_as_dupli_child_original;
+	}
+	else {
+		hide_triangles = false;
+		return (hide_as_dupli_parent || hide_as_dupli_child_original);
+	}
 }
 
 static bool object_render_hide_duplis(BL::Object b_ob)

Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/3dsmax.py	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/3dsmax.py	2013-08-08 05:19:47 UTC (rev 59009)
@@ -119,6 +119,7 @@
 kmi = km.keymap_items.new('marker.move', 'EVT_TWEAK_S', 'ANY')
 kmi = km.keymap_items.new('marker.duplicate', 'D', 'PRESS', shift=True)
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS')
+kmi.properties.extend = False
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', shift=True)
 kmi.properties.extend = True
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', ctrl=True)
@@ -721,6 +722,7 @@
 km = kc.keymaps.new('Animation Channels', space_type='EMPTY', region_type='WINDOW', modal=False)
 
 kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS')
+kmi.properties.extend = False
 kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS', shift=True)
 kmi.properties.extend = True
 kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS', shift=True, ctrl=True)

Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py	2013-08-08 01:53:02 UTC (rev 59008)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py	2013-08-08 05:19:47 UTC (rev 59009)
@@ -186,8 +186,11 @@
 kmi = km.keymap_items.new('marker.move', 'EVT_TWEAK_S', 'ANY')
 kmi = km.keymap_items.new('marker.duplicate', 'D', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS')
+kmi.properties.extend = False
+kmi.properties.camera = False
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', shift=True)
 kmi.properties.extend = True
+kmi.properties.camera = False
 kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', ctrl=True)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list