[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48189] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48168:48188

Campbell Barton ideasman42 at gmail.com
Fri Jun 22 13:56:22 CEST 2012


Revision: 48189
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48189
Author:   campbellbarton
Date:     2012-06-22 11:56:21 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48168:48188

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
    branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_intern.h
    branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/extern/libopenjpeg/cidx_manager.c
    branches/soc-2011-tomato/extern/libopenjpeg/cidx_manager.h
    branches/soc-2011-tomato/extern/libopenjpeg/indexbox_manager.h
    branches/soc-2011-tomato/extern/libopenjpeg/opj_config.h
    branches/soc-2011-tomato/extern/libopenjpeg/phix_manager.c
    branches/soc-2011-tomato/extern/libopenjpeg/ppix_manager.c
    branches/soc-2011-tomato/extern/libopenjpeg/thix_manager.c
    branches/soc-2011-tomato/extern/libopenjpeg/tpix_manager.c
    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-48168
   + /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-48188

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-06-22 11:56:21 UTC (rev 48189)
@@ -1532,6 +1532,7 @@
 		# dealt with above
 	else()
 		set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
+		add_definitions(-DOPJ_STATIC)
 	endif()
 endif()
 

Modified: branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py	2012-06-22 11:56:21 UTC (rev 48189)
@@ -187,7 +187,7 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 CXXFLAGS = []
 
-CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
 REL_CCFLAGS = ['-DNDEBUG',  '-O2']

Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2012-06-22 11:56:21 UTC (rev 48189)
@@ -194,7 +194,7 @@
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
 REL_CCFLAGS = ['-O2', '-DNDEBUG']

Modified: branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py	2012-06-22 11:56:21 UTC (rev 48189)
@@ -185,7 +185,7 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 CXXFLAGS = [ '-fpermissive' ]
 
-CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
+CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
 REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']

Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2012-06-22 11:56:21 UTC (rev 48189)
@@ -193,7 +193,7 @@
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
 
-CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
 REL_CCFLAGS = ['-O2', '-DNDEBUG']


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/cidx_manager.c
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/cidx_manager.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/indexbox_manager.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/opj_config.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/phix_manager.c
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/ppix_manager.c
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/thix_manager.c
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-tomato/extern/libopenjpeg/tpix_manager.c
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2012-06-22 11:56:21 UTC (rev 48189)
@@ -1326,6 +1326,7 @@
         layout.operator("mask.shape_key_clear")
         layout.operator("mask.shape_key_insert")
         layout.operator("mask.shape_key_feather_reset")
+        layout.operator("mask.shape_key_rekey")
 
 
 class CLIP_MT_camera_presets(Menu):

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-06-22 11:56:21 UTC (rev 48189)
@@ -122,6 +122,7 @@
 
 void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe);
 void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe);
+void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const int do_newframe);
 void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene, const int do_newframe);
 void BKE_mask_parent_init(struct MaskParent *parent);
 void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-06-22 11:53:49 UTC (rev 48188)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-06-22 11:56:21 UTC (rev 48189)
@@ -1473,51 +1473,46 @@
 	}
 }
 
-void BKE_mask_evaluate(Mask *mask, const float ctime, const int do_newframe)
+void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const int do_newframe)
 {
-	MaskLayer *masklay;
+	/* animation if available */
+	if (do_newframe) {
+		MaskLayerShape *masklay_shape_a;
+		MaskLayerShape *masklay_shape_b;
+		int found;
 
-	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
-
-		/* animation if available */
-		if (do_newframe) {
-			MaskLayerShape *masklay_shape_a;
-			MaskLayerShape *masklay_shape_b;
-			int found;
-
-			if ((found = BKE_mask_layer_shape_find_frame_range(masklay, ctime,
-			                                                   &masklay_shape_a, &masklay_shape_b)))
-			{
-				if (found == 1) {
+		if ((found = BKE_mask_layer_shape_find_frame_range(masklay, ctime,
+		                                                   &masklay_shape_a, &masklay_shape_b)))
+		{
+			if (found == 1) {
 #if 0
-					printf("%s: exact %d %d (%d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
-					       masklay_shape_a->frame);
+				printf("%s: exact %d %d (%d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
+				       masklay_shape_a->frame);
 #endif
 
-					BKE_mask_layer_shape_to_mask(masklay, masklay_shape_a);
-				}
-				else if (found == 2) {
-					float w = masklay_shape_b->frame - masklay_shape_a->frame;
+				BKE_mask_layer_shape_to_mask(masklay, masklay_shape_a);
+			}
+			else if (found == 2) {
+				float w = masklay_shape_b->frame - masklay_shape_a->frame;
 #if 0
-					printf("%s: tween %d %d (%d %d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
-					       masklay_shape_a->frame, masklay_shape_b->frame);
+				printf("%s: tween %d %d (%d %d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
+				       masklay_shape_a->frame, masklay_shape_b->frame);
 #endif
-					BKE_mask_layer_shape_to_mask_interp(masklay, masklay_shape_a, masklay_shape_b,
-					                                    (ctime - masklay_shape_a->frame) / w);
-				}
-				else {
-					/* always fail, should never happen */
-					BLI_assert(found == 2);
-				}
+				BKE_mask_layer_shape_to_mask_interp(masklay, masklay_shape_a, masklay_shape_b,
+				                                    (ctime - masklay_shape_a->frame) / w);
 			}
+			else {
+				/* always fail, should never happen */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list