[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57115] tags/blender-2.67b-release/blender : svn merge ^/trunk/blender -c56957 -c56960 -c56967 -c56968 -c56971

Campbell Barton ideasman42 at gmail.com
Wed May 29 17:51:12 CEST 2013


Revision: 57115
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57115
Author:   campbellbarton
Date:     2013-05-29 15:51:12 +0000 (Wed, 29 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56957 -c56960 -c56967 -c56968 -c56971

Modified Paths:
--------------
    tags/blender-2.67b-release/blender/release/scripts/startup/bl_operators/wm.py
    tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/object_deform.c
    tags/blender-2.67b-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
    tags/blender-2.67b-release/blender/source/blender/gpu/intern/gpu_material.c
    tags/blender-2.67b-release/blender/source/blender/render/intern/source/imagetexture.c

Property Changed:
----------------
    tags/blender-2.67b-release/blender/


Property changes on: tags/blender-2.67b-release/blender
___________________________________________________________________
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/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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912,56930,56935,56943,56956
   + /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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912,56930,56935,56943,56956-56957,56960,56967-56968,56971

Modified: tags/blender-2.67b-release/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- tags/blender-2.67b-release/blender/release/scripts/startup/bl_operators/wm.py	2013-05-29 15:48:15 UTC (rev 57114)
+++ tags/blender-2.67b-release/blender/release/scripts/startup/bl_operators/wm.py	2013-05-29 15:51:12 UTC (rev 57115)
@@ -1761,7 +1761,11 @@
             return {'CANCELLED'}
 
         # create dir is if missing.
-        os.makedirs(path_addons, exist_ok=True)
+        try:
+            os.makedirs(path_addons, exist_ok=True)
+        except:
+            import traceback
+            traceback.print_exc()
 
         # Check if we are installing from a target path,
         # doing so causes 2+ addons of same name or when the same from/to

Modified: tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/object_deform.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/object_deform.c	2013-05-29 15:48:15 UTC (rev 57114)
+++ tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/object_deform.c	2013-05-29 15:51:12 UTC (rev 57115)
@@ -149,7 +149,7 @@
 		}
 	}
 	else {
-		memset(dg_selection, FALSE, sizeof(char) * defbase_tot);
+		memset(dg_selection, FALSE, sizeof(*dg_selection) * defbase_tot);
 	}
 
 	return dg_selection;

Modified: tags/blender-2.67b-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-05-29 15:48:15 UTC (rev 57114)
+++ tags/blender-2.67b-release/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-05-29 15:51:12 UTC (rev 57115)
@@ -411,6 +411,7 @@
 		{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
+	PropertyRNA *prop;
 
 	/* identifiers */
 	ot->name = "Brush Select";
@@ -430,8 +431,10 @@
 	RNA_def_enum(ot->srna, "weight_paint_tool", brush_vertex_tool_items, 0, "Weight Paint Tool", "");
 	RNA_def_enum(ot->srna, "texture_paint_tool", brush_image_tool_items, 0, "Texture Paint Tool", "");
 
-	RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "Toggle between two brushes rather than cycling");
-	RNA_def_boolean(ot->srna, "create_missing", 0, "Create Missing", "If the requested brush type does not exist, create a new brush");
+	prop = RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "Toggle between two brushes rather than cycling");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+	prop = RNA_def_boolean(ot->srna, "create_missing", 0, "Create Missing", "If the requested brush type does not exist, create a new brush");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 static wmKeyMapItem *keymap_brush_select(wmKeyMap *keymap, int paint_mode,

Modified: tags/blender-2.67b-release/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/gpu/intern/gpu_material.c	2013-05-29 15:48:15 UTC (rev 57114)
+++ tags/blender-2.67b-release/blender/source/blender/gpu/intern/gpu_material.c	2013-05-29 15:51:12 UTC (rev 57115)
@@ -300,6 +300,9 @@
 			}
 		}
 
+		/* note material must be bound before setting uniforms */
+		GPU_pass_bind(material->pass, time, mipmap);
+
 		/* handle per material built-ins */
 		if (material->builtins & GPU_VIEW_MATRIX) {
 			GPU_shader_uniform_vector(shader, material->viewmatloc, 16, 1, (float*)viewmat);
@@ -308,7 +311,6 @@
 			GPU_shader_uniform_vector(shader, material->invviewmatloc, 16, 1, (float*)viewinv);
 		}
 
-		GPU_pass_bind(material->pass, time, mipmap);
 		GPU_pass_update_uniforms(material->pass);
 
 		material->bound = 1;

Modified: tags/blender-2.67b-release/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/render/intern/source/imagetexture.c	2013-05-29 15:48:15 UTC (rev 57114)
+++ tags/blender-2.67b-release/blender/source/blender/render/intern/source/imagetexture.c	2013-05-29 15:51:12 UTC (rev 57115)
@@ -224,9 +224,11 @@
 	}
 
 	/* keep this before interpolation [#29761] */
-	if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
-		if ((tex->imaflag & TEX_CALCALPHA) == 0) {
-			texres->talpha = TRUE;
+	if (ima) {
+		if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
+			if ((tex->imaflag & TEX_CALCALPHA) == 0) {
+				texres->talpha = TRUE;
+			}
 		}
 	}
 
@@ -1529,9 +1531,11 @@
 	/* mipmap test */
 	image_mipmap_test(tex, ibuf);
 
-	if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
-		if ((tex->imaflag & TEX_CALCALPHA) == 0) {
-			texres->talpha = TRUE;
+	if (ima) {
+		if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
+			if ((tex->imaflag & TEX_CALCALPHA) == 0) {
+				texres->talpha = TRUE;
+			}
 		}
 	}
 	




More information about the Bf-blender-cvs mailing list