[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43888] branches/bmesh/blender: svn merge ^/trunk/blender -r43864:43887
Campbell Barton
ideasman42 at gmail.com
Sun Feb 5 03:30:39 CET 2012
Revision: 43888
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43888
Author: campbellbarton
Date: 2012-02-05 02:30:30 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43864:43887
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43864
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/util/util_thread.h
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenfont/SConscript
branches/bmesh/blender/source/blender/blenfont/intern/blf_glyph.c
branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenlib/intern/math_color.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/anim_deps.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_ops.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_meshdeform.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.h
branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageViewport.cpp
branches/bmesh/blender/source/tests/bl_run_operators.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:39992-43864
+ /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
/trunk/blender:39992-43887
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -37,7 +37,7 @@
CHECKER_ARGS = [
# not sure why this is needed, but it is.
"-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
- "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+ "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
# "--max-configs=1", # speeds up execution
# "--check-config", # when includes are missing
"--enable=all", # if you want sixty hundred pedantic suggestions
Modified: branches/bmesh/blender/intern/cycles/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/SConscript 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/intern/cycles/SConscript 2012-02-05 02:30:30 UTC (rev 43888)
@@ -39,6 +39,9 @@
else:
cxxflags.append('-ffast-math'.split())
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs.append(env['BF_PTHREADS_INC'])
+
# optimized kernel
if env['WITH_BF_RAYOPTIMIZATION']:
optim_cxxflags = []
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -370,7 +370,7 @@
visibility = ob.cycles_visibility
flow = layout.column_flow()
-
+
flow.prop(visibility, "camera")
flow.prop(visibility, "diffuse")
flow.prop(visibility, "glossy")
Modified: branches/bmesh/blender/intern/cycles/util/util_thread.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_thread.h 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/intern/cycles/util/util_thread.h 2012-02-05 02:30:30 UTC (rev 43888)
@@ -20,30 +20,55 @@
#define __UTIL_THREAD_H__
#include <boost/thread.hpp>
+#include <pthread.h>
#include <queue>
+#include "util_function.h"
+
CCL_NAMESPACE_BEGIN
-#if 0
+/* use boost for mutexes */
-/* Use STL for threading */
+typedef boost::mutex thread_mutex;
+typedef boost::mutex::scoped_lock thread_scoped_lock;
+typedef boost::condition_variable thread_condition_variable;
-using std::thread;
-using std::thread_mutex;
-typedef std::lock_guard thread_scoped_lock;
-using std::condition_variable;
+/* own pthread based implementation, to avoid boost version conflicts with
+ dynamically loaded blender plugins */
-#else
+class thread {
+public:
+ thread(boost::function<void(void)> run_cb_)
+ {
+ joined = false;
+ run_cb = run_cb_;
-/* Use boost for threading */
+ pthread_create(&pthread_id, NULL, run, (void*)this);
+ }
-using boost::thread;
-typedef boost::mutex thread_mutex;
-typedef boost::mutex::scoped_lock thread_scoped_lock;
-typedef boost::condition_variable thread_condition_variable;
+ ~thread()
+ {
+ if(!joined)
+ join();
+ }
-#endif
+ static void *run(void *arg)
+ {
+ ((thread*)arg)->run_cb();;
+ return NULL;
+ }
+ bool join()
+ {
+ return pthread_join(pthread_id, NULL) == 0;
+ }
+
+protected:
+ boost::function<void(void)> run_cb;
+ pthread_t pthread_id;
+ bool joined;
+};
+
/* Thread Safe Queue to pass tasks from one thread to another. Tasks should be
* pushed into the queue, while the worker thread waits to pop the next task
* off the queue. Once all tasks are into the queue, calling stop() will stop
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43864
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43887
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -69,7 +69,7 @@
if ob.type == 'CAMERA':
for con in ob.constraints:
if con.type == 'CAMERA_SOLVER':
- cur_clip = scene.clip if con.use_active_clip else con.clip
+ cur_clip = scene.active_clip if con.use_active_clip else con.clip
if cur_clip == clip:
return ob
@@ -834,6 +834,7 @@
return {'FINISHED'}
+
class CLIP_OT_track_settings_as_default(Operator):
"""Copy tracking settings from active track to default settings"""
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/object.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/object.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -493,7 +493,8 @@
def execute(self, context):
ob_act = context.active_object
- objects = [ob for ob in context.selected_editable_objects if ob != ob_act]
+ objects = [ob for ob in context.selected_editable_objects
+ if ob != ob_act]
if 1: # swap from/to, means we cant copy to many at once.
if len(objects) != 1:
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -824,12 +824,12 @@
def REMESH(self, layout, ob, md):
layout.prop(md, "mode")
-
+
row = layout.row()
row.prop(md, "octree_depth")
row.prop(md, "scale")
- if md.mode == "SHARP":
+ if md.mode == 'SHARP':
layout.prop(md, "sharpness")
layout.prop(md, "remove_disconnected_pieces")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -435,23 +435,23 @@
self.target_template(layout, con)
split = layout.split()
-
+
col = split.column()
col.label(text="From Target:")
col.prop(con, "transform_channel", text="")
col.prop(con, "target_space", text="")
-
+
col = split.column()
col.label(text="To Action:")
col.prop(con, "action", text="")
-
+
split = layout.split()
-
+
col = split.column(align=True)
col.label(text="Target Range:")
col.prop(con, "min", text="Min")
col.prop(con, "max", text="Max")
-
+
col = split.column(align=True)
col.label(text="Action Range:")
col.prop(con, "frame_start", text="Start")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-05 02:04:26 UTC (rev 43887)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-05 02:30:30 UTC (rev 43888)
@@ -128,9 +128,12 @@
col.separator()
row = col.row(align=True)
- row.prop(settings, "use_default_red_channel", text="R", toggle=True)
- row.prop(settings, "use_default_green_channel", text="G", toggle=True)
- row.prop(settings, "use_default_blue_channel", text="B", toggle=True)
+ row.prop(settings, "use_default_red_channel",
+ text="R", toggle=True)
+ row.prop(settings, "use_default_green_channel",
+ text="G", toggle=True)
+ row.prop(settings, "use_default_blue_channel",
+ text="B", toggle=True)
col.separator()
@@ -155,7 +158,8 @@
col.prop(settings, "default_pattern_match", text="")
col.separator()
- col.operator('clip.track_settings_as_default', text="Copy From Active Track")
+ col.operator('clip.track_settings_as_default',
+ text="Copy From Active Track")
class CLIP_PT_tools_tracking(Panel):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list