[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55074] trunk/blender/source/blender: Alternate fix for bug [#34369], where invalid polygon normals could be saved in the mesh data and in the file .
Revision: 55074 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55074 Author: campbellbarton Date: 2013-03-06 03:58:38 + (Wed, 06 Mar 2013) Log Message: --- Alternate fix for bug [#34369], where invalid polygon normals could be saved in the mesh data and in the file. This was from initial BMesh merge, but should not have been added in since face normals are calculated and stored in the DerivedMesh. Toggling editmode would remove poly-normals so its unlikely anything relies on this custom-data. Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/customdata.c trunk/blender/source/blender/editors/object/object_modifier.c Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c === --- trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-03-06 03:53:56 UTC (rev 55073) +++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-03-06 03:58:38 UTC (rev 55074) @@ -1169,7 +1169,7 @@ CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP | -CD_MASK_MTEXPOLY | CD_MASK_NORMAL | CD_MASK_RECAST | CD_MASK_PAINT_MASK | +CD_MASK_MTEXPOLY | CD_MASK_RECAST | CD_MASK_PAINT_MASK | CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN; const CustomDataMask CD_MASK_EDITMESH = CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MLOOPUV | Modified: trunk/blender/source/blender/editors/object/object_modifier.c === --- trunk/blender/source/blender/editors/object/object_modifier.c 2013-03-06 03:53:56 UTC (rev 55073) +++ trunk/blender/source/blender/editors/object/object_modifier.c 2013-03-06 03:58:38 UTC (rev 55074) @@ -620,8 +620,6 @@ } DM_to_mesh(dm, me, ob); - /* so we don't reuse this normal layer, see: [#34369] */ - CustomData_free_layers(&me->pdata, CD_NORMAL, me->totpoly); dm->release(dm); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55073] trunk/blender/source/blender/ editors/animation/anim_channels_defines.c: Woops! Fix for previous F-Curve path fix commit
Revision: 55073
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55073
Author: aligorith
Date: 2013-03-06 03:53:56 + (Wed, 06 Mar 2013)
Log Message:
---
Woops! Fix for previous F-Curve path fix commit
Trying to rename a valid F-Curve would crash as no RNA property was set, but
*prop still had an uninitialised value.
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2013-03-06 02:57:31 UTC (rev 55072)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2013-03-06 03:53:56 UTC (rev 55073)
@@ -906,6 +906,10 @@
RNA_pointer_create(ale->id, &RNA_FCurve, ale->data, ptr);
*prop = RNA_struct_find_property(ptr, "data_path");
}
+ else {
+ /* for "normal" F-Curves - no editable name, but *prop may not
be set properly yet... */
+ *prop = NULL;
+ }
return (*prop != NULL);
}
@@ -3422,10 +3426,13 @@
/* if rename index matches, add widget for this */
if (ac->ads->renameIndex == channel_index + 1) {
- PointerRNA ptr;
- PropertyRNA *prop;
+ PointerRNA ptr = {{NULL}};
+ PropertyRNA *prop = NULL;
- /* draw renaming widget if we can get RNA pointer for
it */
+ /* draw renaming widget if we can get RNA pointer for
it
+* NOTE: property may only be available in some cases,
even if we have
+* a callback available (e.g. broken F-Curve
rename)
+*/
if (acf->name_prop(ale, &ptr, &prop)) {
uiBut *but;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55072] trunk/blender/source/blender/ blenkernel: code cleanup: quiet warnings for recent weight paint theme addition.
Revision: 55072
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55072
Author: campbellbarton
Date: 2013-03-06 02:57:31 + (Wed, 06 Mar 2013)
Log Message:
---
code cleanup: quiet warnings for recent weight paint theme addition.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-06
02:52:34 UTC (rev 55071)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-06
02:57:31 UTC (rev 55072)
@@ -608,7 +608,7 @@
float *weights, int count, int dest_index);
/* Temporary? A function to give a colorband to derivedmesh for vertexcolor
ranges */
-void vDM_ColorBand_store(struct ColorBand *coba, char zero_color[4]);
+void vDM_ColorBand_store(const struct ColorBand *coba, const char
alert_color[4]);
/** Simple function to get me->totvert amount of vertices/normals,
* correctly deformed and subsurfered. Needed especially when vertexgroups are
involved.
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-06 02:52:34 UTC (rev 55071)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-06 02:57:31 UTC (rev 55072)
@@ -1026,8 +1026,8 @@
};
typedef struct DMWeightColorInfo {
-ColorBand *coba;
-unsigned char *zero_color;
+ const ColorBand *coba;
+ const char *alert_color;
} DMWeightColorInfo;
@@ -1054,17 +1054,18 @@
static void calc_weightpaint_vert_color(
unsigned char r_col[4],
MDeformVert *dv,
- DMWeightColorInfo *dm_wcinfo,
+DMWeightColorInfo *dm_wcinfo,
const int defbase_tot, const int defbase_act,
const char *defbase_sel, const int defbase_sel_tot,
const int draw_flag)
{
float input = 0.0f;
- bool make_black = false;
+ bool show_alert_color = false;
if ((defbase_sel_tot > 1) && (draw_flag & CALC_WP_MULTIPAINT)) {
- int was_a_nonzero = FALSE;
+ /* Multi-Paint feature */
+ bool was_a_nonzero = false;
unsigned int i;
MDeformWeight *dw = dv->dw;
@@ -1075,15 +1076,15 @@
if (defbase_sel[dw->def_nr]) {
if (dw->weight) {
input += dw->weight;
- was_a_nonzero = TRUE;
+ was_a_nonzero = true;
}
}
}
}
/* make it black if the selected groups have no weight on a
vertex */
- if (was_a_nonzero == FALSE) {
- make_black = true;
+ if (was_a_nonzero == false) {
+ show_alert_color = true;
}
else if ((draw_flag & CALC_WP_AUTO_NORMALIZE) == FALSE) {
input /= defbase_sel_tot; /* get the average */
@@ -1095,33 +1096,32 @@
if (draw_flag & CALC_WP_GROUP_USER_ACTIVE) {
if (input == 0.0f) {
- make_black = true;
+ show_alert_color = true;
}
}
else if (draw_flag & CALC_WP_GROUP_USER_ALL) {
if (input == 0.0f) {
- make_black = defvert_is_weight_zero(dv,
defbase_tot);
+ show_alert_color = defvert_is_weight_zero(dv,
defbase_tot);
}
}
}
- if (make_black) {
- r_col[3] = dm_wcinfo->zero_color[3];
- r_col[2] = dm_wcinfo->zero_color[2];
- r_col[1] = dm_wcinfo->zero_color[1];
- r_col[0] = dm_wcinfo->zero_color[0];
- }
- else {
+ if (show_alert_color == false) {
CLAMP(input, 0.0f, 1.0f);
weightpaint_color(r_col, dm_wcinfo, input);
}
+ else {
+ copy_v3_v3_char((char *)r_col, dm_wcinfo->alert_color);
+ r_col[3] = 255;
+ }
}
static DMWeightColorInfo dm_wcinfo;
-void vDM_ColorBand_store(ColorBand *coba, char zero_color[4])
+
+void vDM_ColorBand_store(const ColorBand *coba, const char alert_color[4])
{
- dm_wcinfo.coba = coba;
- dm_wcinfo.zero_color = zero_color;
+ dm_wcinfo.coba= coba;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55071] trunk/blender/source/blender/ blenkernel/intern/tracking.c: code cleanup: quiet float/ double conversion warnings.
Revision: 55071
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55071
Author: campbellbarton
Date: 2013-03-06 02:52:34 + (Wed, 06 Mar 2013)
Log Message:
---
code cleanup: quiet float/double conversion warnings.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/tracking.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-03-06
01:59:09 UTC (rev 55070)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-03-06
02:52:34 UTC (rev 55071)
@@ -1446,7 +1446,7 @@
camera_intrinsics_options->k3 = camera->k3;
camera_intrinsics_options->image_width = calibration_width;
- camera_intrinsics_options->image_height = (double) calibration_height *
aspy;
+ camera_intrinsics_options->image_height = (double) (calibration_height
* aspy);
}
#endif
@@ -1594,8 +1594,8 @@
libmv_InvertIntrinsics(&camera_intrinsics_options, x, y, &x, &y);
- r_co[0] = x * camera->focal + camera->principal[0];
- r_co[1] = y * camera->focal + camera->principal[1] * aspy;
+ r_co[0] = (float)x * camera->focal + camera->principal[0];
+ r_co[1] = (float)y * camera->focal + camera->principal[1] * aspy;
#else
(void) camera;
(void) co;
@@ -1730,14 +1730,14 @@
int a;
for (a = 0; a < 5; a++) {
- src_pixel_x[a] += ((track->offset[0] * frame_width) -
((int) (track->offset[0] * frame_width)));
- src_pixel_y[a] += ((track->offset[1] * frame_height) -
((int) (track->offset[1] * frame_height)));
+ src_pixel_x[a] += (double) ((track->offset[0] *
frame_width) - ((int) (track->offset[0] * frame_width)));
+ src_pixel_y[a] += (double) ((track->offset[1] *
frame_height) - ((int) (track->offset[1] * frame_height)));
/* when offset is negative, rounding happens in
opposite direction */
if (track->offset[0] < 0.0f)
- src_pixel_x[a] += 1.0f;
+ src_pixel_x[a] += 1.0;
if (track->offset[1] < 0.0f)
- src_pixel_y[a] += 1.0f;
+ src_pixel_y[a] += 1.0;
}
}
@@ -2749,7 +2749,7 @@
tracking->camera.focal = focal_length;
tracking->camera.principal[0] = principal_x;
- tracking->camera.principal[1] = principal_y / aspy;
+ tracking->camera.principal[1] = principal_y / (double)aspy;
tracking->camera.k1 = k1;
tracking->camera.k2 = k2;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55070] trunk/blender/source/blender/ editors/animation/anim_filter.c: Bugfix [#32492] - Part 3: Error filter now includes drivers where there are
Revision: 55070
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55070
Author: aligorith
Date: 2013-03-06 01:59:09 + (Wed, 06 Mar 2013)
Log Message:
---
Bugfix [#32492] - Part 3: Error filter now includes drivers where there are
errors with the variables/targets, even if those errors are for variables which
aren't used (and are hence "harmless" errors)
This means that the filter can be truly useful for helping locate things that
need "cleaning up". For example, previously, there could still have been drivers
where there were some of these "harmless" errors would emit warnings, but would
otherwise appear perfectly functional.
The implementation here uses a slightly slower method of checking any errors in
these driver vars. However, it's no slower than what's done when these are
evaluated, and should be less error prone than introducing yet another type of
error tagging for this one case. The problem here is that the "driver invalid"
flag, which is usually set when a target has errors, gets cleared by the
pydrivers code if nothing went wrong when evaluating the expression. Removing
this clearing step will probably open a can of worms, so unless this method
proves to be far too slow, this simpler fix will do.
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_filter.c
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2013-03-06 01:44:12 UTC (rev 55069)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2013-03-06 01:59:09 UTC (rev 55070)
@@ -983,22 +983,39 @@
/* Check if F-Curve has errors and/or is disabled
* > returns: (bool) True if F-Curve has errors/is disabled
*/
-static short fcurve_has_errors(FCurve *fcu)
+static bool fcurve_has_errors(FCurve *fcu)
{
/* F-Curve disabled - path eval error */
if (fcu->flag & FCURVE_DISABLED) {
- return 1;
+ return true;
}
/* driver? */
if (fcu->driver) {
- /* for now, just check if the entire thing got disabled... */
- if (fcu->driver->flag & DRIVER_FLAG_INVALID)
- return 1;
+ ChannelDriver *driver = fcu->driver;
+ DriverVar *dvar;
+
+ /* error flag on driver usually means that there is an error
+* BUT this may not hold with PyDrivers as this flag gets
cleared
+* if no critical errors prevent the driver from working...
+*/
+ if (driver->flag & DRIVER_FLAG_INVALID)
+ return true;
+
+ /* check variables for other things that need linting... */
+ // TODO: maybe it would be more efficient just to have a quick
flag for this?
+ for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
+ DRIVER_TARGETS_USED_LOOPER(dvar)
+ {
+ if (dtar->flag & DTAR_FLAG_INVALID)
+ return true;
+ }
+ DRIVER_TARGETS_LOOPER_END
+ }
}
/* no errors found */
- return 0;
+ return false;
}
/* find the next F-Curve that is usable for inclusion */
@@ -1042,7 +1059,7 @@
/* error-based filtering... */
if ((ads) && (ads->filterflag &
ADS_FILTER_ONLY_ERRORS)) {
/* skip if no errors...
*/
- if
(fcurve_has_errors(fcu) == 0)
+ if
(fcurve_has_errors(fcu) == false)
continue;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55069] trunk/blender/source/blender/ editors/animation/anim_channels_defines.c: Experimental Feature: Ctrl-Click on the "name" of a broken F-Curve no
Revision: 55069
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55069
Author: aligorith
Date: 2013-03-06 01:44:12 + (Wed, 06 Mar 2013)
Log Message:
---
Experimental Feature: Ctrl-Click on the "name" of a broken F-Curve now allows
you to fix the RNA Path in-place
For F-Curves that are disabled or marked as having errors because their paths
are invalid (indicated with a red line underneath their names), it is now
possible to use the Ctrl-Click renaming functionality to bring up a textbox for
fixing the offending RNA Path "in place" (i.e. in the channels list) without
having to bring up the properties region first.
This makes it easier to fix the paths if you know what you're doing. However,
caution is still advised for most people. In particular, be aware that this uses
a separate "RNA Array Index" for indexing into array properties (i.e. location,
rotation, color) which will not be shown here, and can only be edited from the
panel (or datablocks editor/scripts).
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2013-03-06 00:56:58 UTC (rev 55068)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2013-03-06 01:44:12 UTC (rev 55069)
@@ -893,6 +893,23 @@
getname_anim_fcurve(name, ale->id, ale->data);
}
+/* "name" property for fcurve entries */
+static short acf_fcurve_name_prop(bAnimListElem *ale, PointerRNA *ptr,
PropertyRNA **prop)
+{
+ FCurve *fcu = (FCurve *)ale->data;
+
+ /* Ctrl-Click Usability Convenience Hack:
+* For disabled F-Curves, allow access to the RNA Path
+* as our "name" so that user can perform quick fixes
+*/
+ if (fcu->flag & FCURVE_DISABLED) {
+ RNA_pointer_create(ale->id, &RNA_FCurve, ale->data, ptr);
+ *prop = RNA_struct_find_property(ptr, "data_path");
+ }
+
+ return (*prop != NULL);
+}
+
/* check if some setting exists for this channel */
static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale,
int setting)
{
@@ -964,7 +981,7 @@
acf_generic_group_offset, /* offset */
acf_fcurve_name,/* name */
- NULL, /* name prop */
+ acf_fcurve_name_prop, /* name prop */
NULL, /* icon */
acf_fcurve_setting_valid, /* has setting */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
Re: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55068] trunk/blender/release/scripts/ startup/bl_ui/space_dopesheet.py: Feature Request: "Show Errors" Filter for Anim Editors now works for
Awesome, thanks Joshua! :-D --Nathan On Tue, Mar 5, 2013 at 4:56 PM, Joshua Leung wrote: > Revision: 55068 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55068 > Author: aligorith > Date: 2013-03-06 00:56:58 + (Wed, 06 Mar 2013) > Log Message: > --- > Feature Request: "Show Errors" Filter for Anim Editors now works for > F-Curves/Animation as well as Drivers > > This is useful for tracking down invalid F-Curves which might need to have > their > paths fixed, or perhaps to remove F-Curves for controls which no longer exist > in > a new rig. > > Modified Paths: > -- > trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py > > Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py > === > --- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py > 2013-03-05 23:21:10 UTC (rev 55067) > +++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py > 2013-03-06 00:56:58 UTC (rev 55068) > @@ -29,7 +29,6 @@ > def dopesheet_filter(layout, context, genericFiltersOnly=False): > dopesheet = context.space_data.dopesheet > is_nla = context.area.type == 'NLA_EDITOR' > -is_drivers = (context.area.type == 'GRAPH_EDITOR' and > context.space_data.mode == 'DRIVERS') > > row = layout.row(align=True) > row.prop(dopesheet, "show_only_selected", text="") > @@ -37,8 +36,7 @@ > > if is_nla: > row.prop(dopesheet, "show_missing_nla", text="") > - > -if is_drivers: > +else: # graph and dopesheet editors - F-Curves and drivers only > row.prop(dopesheet, "show_only_errors", text="") > > if not genericFiltersOnly: > > ___ > Bf-blender-cvs mailing list > Bf-blender-cvs@blender.org > http://lists.blender.org/mailman/listinfo/bf-blender-cvs ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55068] trunk/blender/release/scripts/ startup/bl_ui/space_dopesheet.py: Feature Request: "Show Errors" Filter for Anim Editors now works for
Revision: 55068 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55068 Author: aligorith Date: 2013-03-06 00:56:58 + (Wed, 06 Mar 2013) Log Message: --- Feature Request: "Show Errors" Filter for Anim Editors now works for F-Curves/Animation as well as Drivers This is useful for tracking down invalid F-Curves which might need to have their paths fixed, or perhaps to remove F-Curves for controls which no longer exist in a new rig. Modified Paths: -- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py === --- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2013-03-05 23:21:10 UTC (rev 55067) +++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2013-03-06 00:56:58 UTC (rev 55068) @@ -29,7 +29,6 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False): dopesheet = context.space_data.dopesheet is_nla = context.area.type == 'NLA_EDITOR' -is_drivers = (context.area.type == 'GRAPH_EDITOR' and context.space_data.mode == 'DRIVERS') row = layout.row(align=True) row.prop(dopesheet, "show_only_selected", text="") @@ -37,8 +36,7 @@ if is_nla: row.prop(dopesheet, "show_missing_nla", text="") - -if is_drivers: +else: # graph and dopesheet editors - F-Curves and drivers only row.prop(dopesheet, "show_only_errors", text="") if not genericFiltersOnly: ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55067] trunk/blender/source/blenderplayer /bad_level_call_stubs/stubs.c: The imperative per-few-days blenderplayer fix.
Revision: 55067
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55067
Author: psy-fi
Date: 2013-03-05 23:21:10 + (Tue, 05 Mar 2013)
Log Message:
---
The imperative per-few-days blenderplayer fix.
Modified Paths:
--
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2013-03-05 23:03:07 UTC (rev 55066)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2013-03-05 23:21:10 UTC (rev 55067)
@@ -109,6 +109,7 @@
struct bNodeTree;
struct bPoseChannel;
struct bPythonConstraint;
+struct bTheme;
struct uiLayout;
struct wmEvent;
struct wmKeyConfig;
@@ -413,6 +414,7 @@
char *uiLayoutIntrospect(struct uiLayout *layout) {return (char *)NULL;}
void UI_reinit_font(void) {}
int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int
rnaicon, int big) {return 0;}
+struct bTheme *UI_GetTheme(void) {};
/* rna template */
void uiTemplateAnyID(struct uiLayout *layout, struct bContext *C, struct
PointerRNA *ptr, char *propname, char *text) {}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55066] trunk/blender/CMakeLists.txt: Reverting accidental commit
Revision: 55066 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55066 Author: genscher Date: 2013-03-05 23:03:07 + (Tue, 05 Mar 2013) Log Message: --- Reverting accidental commit Modified Paths: -- trunk/blender/CMakeLists.txt Modified: trunk/blender/CMakeLists.txt === --- trunk/blender/CMakeLists.txt2013-03-05 22:58:13 UTC (rev 55065) +++ trunk/blender/CMakeLists.txt2013-03-05 23:03:07 UTC (rev 55066) @@ -200,7 +200,7 @@ option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) # option(WITH_MOD_CLOTH_ELTOPO"Enable Experimental cloth solver" OFF) # this is now only available in a branch # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) -option(WITH_MOD_OCEANSIM"Enable Ocean Modifier" ON) +option(WITH_MOD_OCEANSIM"Enable Ocean Modifier" OFF) # Image format support option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) @@ -214,9 +214,9 @@ # Audio/Video format support option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON) -option(WITH_CODEC_FFMPEG"Enable FFMPeg Support (http://ffmpeg.org)" ON) +option(WITH_CODEC_FFMPEG"Enable FFMPeg Support (http://ffmpeg.org)" OFF) -option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" ON) +option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF) if(APPLE OR (WIN32 AND NOT UNIX)) option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF) endif() @@ -257,13 +257,13 @@ option(WITH_CYCLES "Enable cycles Render Engine" ON) option(WITH_CYCLES_TEST"Build cycles test application" OFF) option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF) -option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" ON) +option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) unset(PLATFORM_DEFAULT) # LLVM -option(WITH_LLVM "Use LLVM" ON) +option(WITH_LLVM "Use LLVM" OFF) # disable for now, but plan to support on all platforms eventually option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55065] trunk/blender: Bugfix [#34519] deleted cache after duplicating an object with baked simulation
Revision: 55065 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55065 Author: genscher Date: 2013-03-05 22:58:13 + (Tue, 05 Mar 2013) Log Message: --- Bugfix [#34519] deleted cache after duplicating an object with baked simulation Modified Paths: -- trunk/blender/CMakeLists.txt trunk/blender/source/blender/modifiers/intern/MOD_cloth.c Modified: trunk/blender/CMakeLists.txt === --- trunk/blender/CMakeLists.txt2013-03-05 22:34:15 UTC (rev 55064) +++ trunk/blender/CMakeLists.txt2013-03-05 22:58:13 UTC (rev 55065) @@ -200,7 +200,7 @@ option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) # option(WITH_MOD_CLOTH_ELTOPO"Enable Experimental cloth solver" OFF) # this is now only available in a branch # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) -option(WITH_MOD_OCEANSIM"Enable Ocean Modifier" OFF) +option(WITH_MOD_OCEANSIM"Enable Ocean Modifier" ON) # Image format support option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) @@ -214,9 +214,9 @@ # Audio/Video format support option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON) -option(WITH_CODEC_FFMPEG"Enable FFMPeg Support (http://ffmpeg.org)" OFF) +option(WITH_CODEC_FFMPEG"Enable FFMPeg Support (http://ffmpeg.org)" ON) -option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF) +option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" ON) if(APPLE OR (WIN32 AND NOT UNIX)) option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF) endif() @@ -257,13 +257,13 @@ option(WITH_CYCLES "Enable cycles Render Engine" ON) option(WITH_CYCLES_TEST"Build cycles test application" OFF) option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF) -option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) +option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" ON) set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) unset(PLATFORM_DEFAULT) # LLVM -option(WITH_LLVM "Use LLVM" OFF) +option(WITH_LLVM "Use LLVM" ON) # disable for now, but plan to support on all platforms eventually option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) Modified: trunk/blender/source/blender/modifiers/intern/MOD_cloth.c === --- trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2013-03-05 22:34:15 UTC (rev 55064) +++ trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2013-03-05 22:58:13 UTC (rev 55065) @@ -155,7 +155,6 @@ if (clmd->sim_parms->effector_weights) tclmd->sim_parms->effector_weights = MEM_dupallocN(clmd->sim_parms->effector_weights); tclmd->coll_parms = MEM_dupallocN(clmd->coll_parms); - tclmd->point_cache = BKE_ptcache_copy_list(&tclmd->ptcaches, &clmd->ptcaches, FALSE); tclmd->clothObject = NULL; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55064] trunk/lib/tests/rendering/cycles: Cycles test rendering script
Revision: 55064 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55064 Author: blendix Date: 2013-03-05 22:34:15 + (Tue, 05 Mar 2013) Log Message: --- Cycles test rendering script * Support running the script from blender so the path to the executable does not need to be specified in the script. * Add support for automatic diffing between renders if OpenImageIO idiff is installed. * Print compact output that still shows progress but just prints OK/Failed at the end with full output written to log files. * Remove test.py from .blend files and run it with -P option, easier to add new .blend files then and make changes to the script. * Update reference renders, some did not have the same resolution as the .blend files which makes diff fail. Modified Paths: -- trunk/lib/tests/rendering/cycles/blend_files/bmps.blend trunk/lib/tests/rendering/cycles/blend_files/bmw.blend trunk/lib/tests/rendering/cycles/blend_files/closures.blend trunk/lib/tests/rendering/cycles/blend_files/color_ramp.blend trunk/lib/tests/rendering/cycles/blend_files/cornell_box.blend trunk/lib/tests/rendering/cycles/blend_files/hair.blend trunk/lib/tests/rendering/cycles/blend_files/images.blend trunk/lib/tests/rendering/cycles/blend_files/lamps.blend trunk/lib/tests/rendering/cycles/blend_files/motion_blur.blend trunk/lib/tests/rendering/cycles/blend_files/object_info_node.blend trunk/lib/tests/rendering/cycles/blend_files/osl.blend trunk/lib/tests/rendering/cycles/blend_files/procedural_textures.blend trunk/lib/tests/rendering/cycles/blend_files/render_passes.blend trunk/lib/tests/rendering/cycles/readme.txt trunk/lib/tests/rendering/cycles/reference_renders/bmps_osl.png trunk/lib/tests/rendering/cycles/reference_renders/bmps_svm.png trunk/lib/tests/rendering/cycles/reference_renders/closures_osl.png trunk/lib/tests/rendering/cycles/reference_renders/closures_svm.png trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_osl.png trunk/lib/tests/rendering/cycles/reference_renders/color_ramp_svm.png trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_osl.png trunk/lib/tests/rendering/cycles/reference_renders/cornell_box_svm.png trunk/lib/tests/rendering/cycles/reference_renders/hair_osl.png trunk/lib/tests/rendering/cycles/reference_renders/hair_svm.png trunk/lib/tests/rendering/cycles/reference_renders/images_osl.png trunk/lib/tests/rendering/cycles/reference_renders/images_svm.png trunk/lib/tests/rendering/cycles/reference_renders/information.txt trunk/lib/tests/rendering/cycles/reference_renders/lamps_osl.png trunk/lib/tests/rendering/cycles/reference_renders/lamps_svm.png trunk/lib/tests/rendering/cycles/reference_renders/osl_osl.png trunk/lib/tests/rendering/cycles/reference_renders/osl_svm.png trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_osl.png trunk/lib/tests/rendering/cycles/reference_renders/procedural_textures_svm.png trunk/lib/tests/rendering/cycles/render_test_files.py trunk/lib/tests/rendering/cycles/test_utils.py Added Paths: --- trunk/lib/tests/rendering/cycles/reference_renders/bmw_osl.png trunk/lib/tests/rendering/cycles/reference_renders/bmw_svm.png trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_osl.png trunk/lib/tests/rendering/cycles/reference_renders/motion_blur_svm.png trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_osl.png trunk/lib/tests/rendering/cycles/reference_renders/object_info_node_svm.png trunk/lib/tests/rendering/cycles/reference_renders/render_passes_osl.png trunk/lib/tests/rendering/cycles/reference_renders/render_passes_svm.png trunk/lib/tests/rendering/cycles/test_config.py trunk/lib/tests/rendering/cycles/test_run.py Modified: trunk/lib/tests/rendering/cycles/blend_files/bmps.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/bmw.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/closures.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/color_ramp.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/cornell_box.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/hair.blend === (Binary files differ) Modified: trunk/lib/tests/rendering/cycles/blend_files/images.blend
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55063] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: Fix build error after previous commit, mismatch with function prototype.
Revision: 55063
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55063
Author: blendix
Date: 2013-03-05 21:32:46 + (Tue, 05 Mar 2013)
Log Message:
---
Fix build error after previous commit, mismatch with function prototype.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-05 20:30:38 UTC (rev 55062)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-05 21:32:46 UTC (rev 55063)
@@ -1118,7 +1118,7 @@
}
static DMWeightColorInfo dm_wcinfo;
-void vDM_ColorBand_store(ColorBand *coba, unsigned char* zero_color)
+void vDM_ColorBand_store(ColorBand *coba, char zero_color[4])
{
dm_wcinfo.coba = coba;
dm_wcinfo.zero_color = zero_color;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55062] trunk/blender/source/blender: Weight Painting: Added userpref for zero_weight color.
Revision: 55062
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55062
Author: gaiaclary
Date: 2013-03-05 20:30:38 + (Tue, 05 Mar 2013)
Log Message:
---
Weight Painting: Added userpref for zero_weight color.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-05
20:25:08 UTC (rev 55061)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-05
20:30:38 UTC (rev 55062)
@@ -608,7 +608,7 @@
float *weights, int count, int dest_index);
/* Temporary? A function to give a colorband to derivedmesh for vertexcolor
ranges */
-void vDM_ColorBand_store(struct ColorBand *coba);
+void vDM_ColorBand_store(struct ColorBand *coba, char zero_color[4]);
/** Simple function to get me->totvert amount of vertices/normals,
* correctly deformed and subsurfered. Needed especially when vertexgroups are
involved.
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-05 20:25:08 UTC (rev 55061)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-03-05 20:30:38 UTC (rev 55062)
@@ -1025,12 +1025,18 @@
CALC_WP_AUTO_NORMALIZE = (1 << 4)
};
-static void weightpaint_color(unsigned char r_col[4], ColorBand *coba, const
float input)
+typedef struct DMWeightColorInfo {
+ColorBand *coba;
+unsigned char *zero_color;
+} DMWeightColorInfo;
+
+
+static void weightpaint_color(unsigned char r_col[4], DMWeightColorInfo
*dm_wcinfo, const float input)
{
float colf[4];
- if (coba) {
- do_colorband(coba, input, colf);
+ if (dm_wcinfo->coba) {
+ do_colorband(dm_wcinfo->coba, input, colf);
}
else {
weight_to_rgb(colf, input);
@@ -1047,7 +1053,8 @@
static void calc_weightpaint_vert_color(
unsigned char r_col[4],
-MDeformVert *dv, ColorBand *coba,
+MDeformVert *dv,
+ DMWeightColorInfo *dm_wcinfo,
const int defbase_tot, const int defbase_act,
const char *defbase_sel, const int defbase_sel_tot,
const int draw_flag)
@@ -1098,23 +1105,23 @@
}
}
- if (make_black) { /* TODO, theme color */
- r_col[3] = 255;
- r_col[2] = 0;
- r_col[1] = 0;
- r_col[0] = 0;
+ if (make_black) {
+ r_col[3] = dm_wcinfo->zero_color[3];
+ r_col[2] = dm_wcinfo->zero_color[2];
+ r_col[1] = dm_wcinfo->zero_color[1];
+ r_col[0] = dm_wcinfo->zero_color[0];
}
else {
CLAMP(input, 0.0f, 1.0f);
- weightpaint_color(r_col, coba, input);
+ weightpaint_color(r_col, dm_wcinfo, input);
}
}
-static ColorBand *stored_cb = NULL;
-
-void vDM_ColorBand_store(ColorBand *coba)
+static DMWeightColorInfo dm_wcinfo;
+void vDM_ColorBand_store(ColorBand *coba, unsigned char* zero_color)
{
- stored_cb = coba;
+ dm_wcinfo.coba = coba;
+ dm_wcinfo.zero_color = zero_color;
}
/* return an array of vertex weight colors, caller must free.
@@ -1122,11 +1129,11 @@
* note that we could save some memory and allocate RGB only but then we'd
need to
* re-arrange the colors when copying to the face since MCol has odd ordering,
* so leave this as is - campbell */
-static unsigned char *calc_weightpaint_vert_array(Object *ob, DerivedMesh *dm,
int const draw_flag, ColorBand *coba)
+static unsigned char *calc_weightpaint_vert_array(Object *ob, DerivedMesh *dm,
int const draw_flag, DMWeightColorInfo *dm_wcinfo)
{
MDeformVert *dv = DM_get_vert_data_layer(dm, CD_MDEFORMVERT);
int numVerts = dm->getNumVerts(dm);
- unsigned char *wtcol_v = MEM_mallocN(sizeof(unsigned char) * numVerts *
4, "weightmap_v");
+ unsigned char *wtcol_v = MEM_mallocN(sizeof(unsigned char) *
numVerts * 4, "weightmap_v");
if (dv) {
unsigned char *wc = wtcol_v;
@@ -1144,7 +1151,7 @@
}
for (i = numVerts; i != 0; i--, wc += 4, dv++) {
- calc_weightpaint_vert_color(wc, dv, coba, defbase_tot,
defbase_act, defbase_sel, defbase_sel_tot, draw_flag);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55061] trunk/blender/source/blender/ editors/sculpt_paint/paint_cursor.c: Fix cursor display for anchored brushes due to own recent change of
Revision: 55061
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55061
Author: psy-fi
Date: 2013-03-05 20:25:08 + (Tue, 05 Mar 2013)
Log Message:
---
Fix cursor display for anchored brushes due to own recent change of
paint coordinate system.
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
2013-03-05 18:05:18 UTC (rev 55060)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
2013-03-05 20:25:08 UTC (rev 55061)
@@ -590,8 +590,8 @@
if (ups->draw_anchored) {
final_radius = ups->anchored_size;
- translation[0] = ups->anchored_initial_mouse[0] -
vc.ar->winrct.xmin;
- translation[1] = ups->anchored_initial_mouse[1] -
vc.ar->winrct.ymin;
+ translation[0] = ups->anchored_initial_mouse[0];
+ translation[1] = ups->anchored_initial_mouse[1];
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55060] branches/soc-2011-tomato: Merging r54848 through r55059 from trunk into soc-2011-tomato
Revision: 55060 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55060 Author: nazgul Date: 2013-03-05 18:05:18 + (Tue, 05 Mar 2013) Log Message: --- Merging r54848 through r55059 from trunk into soc-2011-tomato Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54848 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55059 Modified Paths: -- branches/soc-2011-tomato/CMakeLists.txt branches/soc-2011-tomato/SConstruct branches/soc-2011-tomato/build_files/cmake/macros.cmake branches/soc-2011-tomato/build_files/scons/tools/Blender.py branches/soc-2011-tomato/doc/build_systems/cmake.txt branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst branches/soc-2011-tomato/extern/libmv/CMakeLists.txt branches/soc-2011-tomato/extern/libmv/ChangeLog branches/soc-2011-tomato/extern/libmv/SConscript branches/soc-2011-tomato/extern/libmv/bundle.sh branches/soc-2011-tomato/extern/libmv/files.txt branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.h branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/intersect.cc branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/modal_solver.cc branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/pipeline.cc branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp branches/soc-2011-tomato/extern/libmv/libmv-capi.h branches/soc-2011-tomato/extern/libmv/patches/series branches/soc-2011-tomato/extern/libmv/third_party/ceres/CMakeLists.txt branches/soc-2011-tomato/extern/libmv/third_party/ceres/ChangeLog branches/soc-2011-tomato/extern/libmv/third_party/ceres/SConscript branches/soc-2011-tomato/extern/libmv/third_party/ceres/bundle.sh branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/problem.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/solver.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/evaluator.h branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55059] trunk/blender/source/blender/ makesrna/intern/rna_modifier.c: UI messages fix: no end point in tips! ( from r55055).
Revision: 55059 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55059 Author: mont29 Date: 2013-03-05 15:15:53 + (Tue, 05 Mar 2013) Log Message: --- UI messages fix: no end point in tips! (from r55055). Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55055 Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_modifier.c Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c === --- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-03-05 14:47:49 UTC (rev 55058) +++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-03-05 15:15:53 UTC (rev 55059) @@ -2590,14 +2590,14 @@ prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); RNA_def_property_ui_range(prop, -10, 10, 1, 3); - RNA_def_property_ui_text(prop, "Factor", "Amount to deform object."); + RNA_def_property_ui_text(prop, "Factor", "Amount to deform object"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "factor"); RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); RNA_def_property_ui_range(prop, -10, 10, 1, 3); - RNA_def_property_ui_text(prop, "Angle", "Angle of deformation."); + RNA_def_property_ui_text(prop, "Angle", "Angle of deformation"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "limits", PROP_FLOAT, PROP_NONE); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55058] trunk/blender/source: code cleanup : also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not to confuse things.
Revision: 55058
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55058
Author: campbellbarton
Date: 2013-03-05 14:47:49 + (Tue, 05 Mar 2013)
Log Message:
---
code cleanup: also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not
to confuse things.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/render/intern/source/bake.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05
14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05
14:47:49 UTC (rev 55058)
@@ -50,7 +50,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHARa
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-05
14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-05
14:47:49 UTC (rev 55058)
@@ -783,10 +783,8 @@
/* goalfac= 1.0f; */ /* UNUSED
*/
- /*
// Kicking goal factor to
simplify things...who uses that anyway?
// ABS (
clmd->sim_parms->maxgoal - clmd->sim_parms->mingoal );
- */
verts->goal =
powf(verts->goal, 4.0f);
if ( verts->goal >=
SOFTGOALSNAP )
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-05
14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-05
14:47:49 UTC (rev 55058)
@@ -654,7 +654,7 @@
{
int i;
- *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult *
64, "collision array" ); //*4 since cloth_collision_static can return more than
1 collision
+ *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult *
64, "collision array" ); // * 4 since cloth_collision_static can return more
than 1 collision
*collisions_index = *collisions;
for ( i = 0; i < numresult; i++ ) {
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===
--- trunk/blender/source/blender/blenlib/intern/storage.c 2013-03-05
14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2013-03-05
14:47:49 UTC (rev 55058)
@@ -453,8 +453,7 @@
void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries)
{
unsigned int i;
- for (i = 0; i < nrentries; ++i)
- {
+ for (i = 0; i < nrentries; ++i) {
struct direntry * const entry = filelist + i;
if (entry->image) {
IMB_freeImBuf(entry->image);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-05
14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-05
14:47:49 UTC (rev 55058)
@@ -5309,8 +5309,9 @@
/* link cache */
direct_link_pointcache_list(fd, &rbw->ptcaches,
&rbw->pointcache, FALSE);
/* make sure simulation starts from the beginning after lo
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55057] tags/blender-2.66a-release/blender /source/blender/blenkernel/BKE_blender.h: committed 'a' version
Revision: 55057 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55057 Author: campbellbarton Date: 2013-03-05 14:45:02 + (Tue, 05 Mar 2013) Log Message: --- committed 'a' version Modified Paths: -- tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h === --- tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 14:43:07 UTC (rev 55056) +++ tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 14:45:02 UTC (rev 55057) @@ -50,7 +50,7 @@ /* used by packaging tools */ /* can be left blank, otherwise a,b,c... etc with no quotes */ -#define BLENDER_VERSION_CHAR +#define BLENDER_VERSION_CHARa /* alpha/beta/rc/release, docs use this */ #define BLENDER_VERSION_CYCLE release ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55056] tags/blender-2.66a-release/blender : svn merge ^/trunk/ blender -c54904 -c54936 -c54937 -c55010 -c55011 -c55012 -c55021 -c55027 -c55028 -c5504
Revision: 55056 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55056 Author: campbellbarton Date: 2013-03-05 14:43:07 + (Tue, 05 Mar 2013) Log Message: --- svn merge ^/trunk/blender -c54904 -c54936 -c54937 -c55010 -c55011 -c55012 -c55021 -c55027 -c55028 -c55047 -c55048 -c55051 Modified Paths: -- tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_tracking.h tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/blender.c tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/tracking.c tags/blender-2.66a-release/blender/source/blender/blenloader/intern/writefile.c tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.cpp tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.h tags/blender-2.66a-release/blender/source/blender/editors/interface/interface_draw.c tags/blender-2.66a-release/blender/source/blender/editors/space_node/node_relationships.c tags/blender-2.66a-release/blender/source/blender/editors/space_sequencer/sequencer_draw.c tags/blender-2.66a-release/blender/source/blender/editors/space_sequencer/space_sequencer.c tags/blender-2.66a-release/blender/source/blender/imbuf/intern/colormanagement.c tags/blender-2.66a-release/blender/source/blender/imbuf/intern/imageprocess.c tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_space_types.h tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_space.c tags/blender-2.66a-release/blender/source/blender/windowmanager/intern/wm_operators.c tags/blender-2.66a-release/blender/source/blender/windowmanager/intern/wm_playanim.c tags/blender-2.66a-release/blender/source/blender/windowmanager/wm_event_types.h Property Changed: tags/blender-2.66a-release/blender/ Property changes on: tags/blender-2.66a-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 /trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55022,55026 + /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 /trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903-54904,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54937,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55021-55022,55026-55028,55047-55048,55051 Modified: tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py === --- tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-03-05 14:42:06 UTC (rev 55055) +++ tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-03-05 14:43:07 UTC (re
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55055] trunk/blender: Simple deform modifier: replace factor property by angle for twist and bend
Revision: 55055
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55055
Author: blendix
Date: 2013-03-05 14:42:06 + (Tue, 05 Mar 2013)
Log Message:
---
Simple deform modifier: replace factor property by angle for twist and bend
modes, so we can show degrees rather than radians. Still refers to the same
DNA variable to keep backwards compatibility.
Patch #33807 by Gottfried Hofmann.
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
Modified:
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2013-03-05 14:19:09 UTC (rev 55054)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2013-03-05 14:42:06 UTC (rev 55055)
@@ -715,7 +715,10 @@
col = split.column()
col.label(text="Deform:")
-col.prop(md, "factor")
+if md.deform_method in {'TAPER', 'STRETCH'}:
+col.prop(md, "factor")
+else:
+col.prop(md, "angle")
col.prop(md, "limits", slider=True)
if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
col.prop(md, "lock_x")
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-03-05
14:19:09 UTC (rev 55054)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-03-05
14:42:06 UTC (rev 55055)
@@ -2590,9 +2590,16 @@
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -10, 10, 1, 3);
- RNA_def_property_ui_text(prop, "Factor", "Amount to deform object");
+ RNA_def_property_ui_text(prop, "Factor", "Amount to deform object.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
+ prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
+ RNA_def_property_float_sdna(prop, NULL, "factor");
+ RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
+ RNA_def_property_ui_range(prop, -10, 10, 1, 3);
+ RNA_def_property_ui_text(prop, "Angle", "Angle of deformation.");
+ RNA_def_property_update(prop, 0, "rna_Modifier_update");
+
prop = RNA_def_property(srna, "limits", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "limit");
RNA_def_property_array(prop, 2);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55054] tags/blender-2.66a-release/blender /release/datafiles/splash.png: splash screen for 2.66a
Revision: 55054 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55054 Author: campbellbarton Date: 2013-03-05 14:19:09 + (Tue, 05 Mar 2013) Log Message: --- splash screen for 2.66a Modified Paths: -- tags/blender-2.66a-release/blender/release/datafiles/splash.png Modified: tags/blender-2.66a-release/blender/release/datafiles/splash.png === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55053] tags/blender-2.66a-release/blender : svn merge ^/trunk/blender -c55022 -c55026
Revision: 55053 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55053 Author: blendix Date: 2013-03-05 14:04:33 + (Tue, 05 Mar 2013) Log Message: --- svn merge ^/trunk/blender -c55022 -c55026 Modified Paths: -- tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/texture.c tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c tags/blender-2.66a-release/blender/source/blender/editors/render/render_preview.c tags/blender-2.66a-release/blender/source/blender/gpu/intern/gpu_material.c tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_texture_types.h tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_texture.c tags/blender-2.66a-release/blender/source/blender/render/intern/source/imagetexture.c Property Changed: tags/blender-2.66a-release/blender/ Property changes on: tags/blender-2.66a-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 /trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012 + /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 /trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55022,55026 Modified: tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py === --- tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py 2013-03-05 12:41:17 UTC (rev 55052) +++ tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py 2013-03-05 14:04:33 UTC (rev 55053) @@ -448,6 +448,9 @@ col = split.column() col.label(text="Alpha:") +row = col.row() +row.active = tex.image and tex.image.use_alpha +row.prop(tex, "use_alpha", text="Use") col.prop(tex, "use_calculate_alpha", text="Calculate") col.prop(tex, "invert_alpha", text="Invert") col.separator() Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h === --- tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 12:41:17 UTC (rev 55052) +++ tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 14:04:33 UTC (rev 55053) @@ -42,7 +42,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 266 -#define BLENDER_SUBVERSION 0 +#define BLENDER_SUBVERSION 1 /* 262 was the last editmesh release but it has comp
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55052] trunk/blender/source/blender/ editors/space_clip: View All operator for motion tracking dopesheet.
Revision: 55052
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55052
Author: nazgul
Date: 2013-03-05 12:41:17 + (Tue, 05 Mar 2013)
Log Message:
---
View All operator for motion tracking dopesheet.
Modified Paths:
--
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
trunk/blender/source/blender/editors/space_clip/clip_intern.h
trunk/blender/source/blender/editors/space_clip/space_clip.c
Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
===
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
2013-03-05 11:19:21 UTC (rev 55051)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
2013-03-05 12:41:17 UTC (rev 55052)
@@ -59,12 +59,11 @@
#include "clip_intern.h" // own include
-#if 0
-static int ED_space_clip_dopesheet_poll(bContext *C)
+static int space_clip_dopesheet_poll(bContext *C)
{
- SpaceClip *sc = CTX_wm_space_clip(C);
+ if (ED_space_clip_tracking_poll(C)) {
+ SpaceClip *sc = CTX_wm_space_clip(C);
- if (sc && sc->clip) {
if (sc->view == SC_VIEW_DOPESHEET) {
ARegion *ar = CTX_wm_region(C);
@@ -74,7 +73,6 @@
return FALSE;
}
-#endif
/** select channel operator */
@@ -161,3 +159,54 @@
RNA_def_boolean(ot->srna, "extend", 0,
"Extend", "Extend selection rather than clearing the
existing selection");
}
+
+/** View All operator */
+
+static int dopesheet_view_all_exec(bContext *C, wmOperator *UNUSED(op))
+{
+ SpaceClip *sc = CTX_wm_space_clip(C);
+ ARegion *ar = CTX_wm_region(C);
+ View2D *v2d = &ar->v2d;
+ MovieClip *clip = ED_space_clip_get_clip(sc);
+ MovieTracking *tracking = &clip->tracking;
+ MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
+ MovieTrackingDopesheetChannel *channel;
+ int frame_min = INT_MAX, frame_max = INT_MIN;
+
+ for (channel = dopesheet->channels.first; channel; channel =
channel->next) {
+ frame_min = min_ii(frame_min, channel->segments[0]);
+ frame_max = max_ii(frame_max,
channel->segments[channel->tot_segment]);
+ }
+
+ if (frame_min < frame_max) {
+ float extra;
+
+ v2d->cur.xmin = frame_min;
+ v2d->cur.xmax = frame_max;
+
+ /* we need an extra "buffer" factor on either side so that the
endpoints are visible */
+ extra = 0.01f * BLI_rctf_size_x(&v2d->cur);
+ v2d->cur.xmin -= extra;
+ v2d->cur.xmax += extra;
+
+ ED_region_tag_redraw(ar);
+ }
+
+
+ return OPERATOR_FINISHED;
+}
+
+void CLIP_OT_dopesheet_view_all(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "View All";
+ ot->description = "Reset viewable area to show full keyframe range";
+ ot->idname = "CLIP_OT_dopesheet_view_all";
+
+ /* api callbacks */
+ ot->exec = dopesheet_view_all_exec;
+ ot->poll = space_clip_dopesheet_poll;
+
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
Modified: trunk/blender/source/blender/editors/space_clip/clip_intern.h
===
--- trunk/blender/source/blender/editors/space_clip/clip_intern.h
2013-03-05 11:19:21 UTC (rev 55051)
+++ trunk/blender/source/blender/editors/space_clip/clip_intern.h
2013-03-05 12:41:17 UTC (rev 55052)
@@ -67,6 +67,7 @@
/* clip_dopesheet_ops.c */
void CLIP_OT_dopesheet_select_channel(struct wmOperatorType *ot);
+void CLIP_OT_dopesheet_view_all(struct wmOperatorType *ot);
/* clip_draw.c */
void clip_draw_main(const struct bContext *C, struct SpaceClip *sc, struct
ARegion *ar);
Modified: trunk/blender/source/blender/editors/space_clip/space_clip.c
===
--- trunk/blender/source/blender/editors/space_clip/space_clip.c
2013-03-05 11:19:21 UTC (rev 55051)
+++ trunk/blender/source/blender/editors/space_clip/space_clip.c
2013-03-05 12:41:17 UTC (rev 55052)
@@ -534,6 +534,7 @@
/* ** clip_dopesheet_ops.c ** */
WM_operatortype_append(CLIP_OT_dopesheet_select_channel);
+ WM_operatortype_append(CLIP_OT_dopesheet_view_all);
}
static void clip_keymap(struct wmKeyConfig *keyconf)
@@ -768,6 +769,8 @@
kmi = WM_keymap_add_item(keymap, "CLIP_OT_dopesheet_select_channel",
ACTIONMOUSE, KM_PRESS, 0, 0);
RNA_boolean_set(kmi->ptr, "extend", TRUE); /* toggle */
+
+ WM_keymap_add_item(keymap, "CLIP_OT_dopesheet_view_all", HOMEKEY,
KM_PRESS, 0, 0);
}
const char *clip_context_dir[] = {"edit_movieclip", "edit_mask", NULL};
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55051] trunk/blender/source/blender: Bug fix #34534
Revision: 55051
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55051
Author: ton
Date: 2013-03-05 11:19:21 + (Tue, 05 Mar 2013)
Log Message:
---
Bug fix #34534
Fix for 2.66a
The new Copy/Paste objects feature could hang in eternal loop.
Only happens for objects that refer to another scene via linkage.
This fix then crashed Blender, needed to add a NULL check for screens.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenloader/intern/writefile.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===
--- trunk/blender/source/blender/blenkernel/intern/blender.c2013-03-05
09:38:50 UTC (rev 55050)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c2013-03-05
11:19:21 UTC (rev 55051)
@@ -899,7 +899,9 @@
{
if (vid) {
ID *id = vid;
- id->flag |= LIB_NEED_EXPAND | LIB_DOIT;
+ /* only tag for need-expand if not done, prevents eternal loops
*/
+ if ((id->flag & LIB_DOIT) == 0)
+ id->flag |= LIB_NEED_EXPAND | LIB_DOIT;
}
}
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-05
09:38:50 UTC (rev 55050)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-05
11:19:21 UTC (rev 55051)
@@ -798,14 +798,15 @@
static void write_renderinfo(WriteData *wd, Main *mainvar)
{
bScreen *curscreen;
- Scene *sce;
+ Scene *sce, *curscene = NULL;
RenderInfo data;
/* XXX in future, handle multiple windows with multiple screens? */
current_screen_compat(mainvar, &curscreen);
-
+ if (curscreen) curscene = curscreen->scene;
+
for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
- if (sce->id.lib == NULL && (sce == curscreen->scene ||
(sce->r.scemode & R_BG_RENDER))) {
+ if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode
& R_BG_RENDER))) {
data.sfra = sce->r.sfra;
data.efra = sce->r.efra;
memset(data.scene_name, 0, sizeof(data.scene_name));
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55050] trunk/blender/extern/libmv/libmv: Switch from DENSE_NORMAL_CHOLESKY to DENSE_QR
Revision: 55050
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55050
Author: nazgul
Date: 2013-03-05 09:38:50 + (Tue, 05 Mar 2013)
Log Message:
---
Switch from DENSE_NORMAL_CHOLESKY to DENSE_QR
DENSE_QR is better behaved numerically and after recent
changes from Sameer there's no big difference in speed.
Modified Paths:
--
trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
trunk/blender/extern/libmv/libmv/tracking/track_region.cc
Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
===
--- trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
2013-03-05 09:38:43 UTC (rev 55049)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
2013-03-05 09:38:50 UTC (rev 55050)
@@ -117,7 +117,7 @@
// Configure the solve.
ceres::Solver::Options solver_options;
- solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY;
+ solver_options.linear_solver_type = ceres::DENSE_QR;
solver_options.max_num_iterations = 50;
solver_options.update_state_every_iteration = true;
solver_options.parameter_tolerance = 1e-16;
Modified: trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
===
--- trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
2013-03-05 09:38:43 UTC (rev 55049)
+++ trunk/blender/extern/libmv/libmv/simple_pipeline/modal_solver.cc
2013-03-05 09:38:50 UTC (rev 55050)
@@ -200,7 +200,7 @@
if (num_residuals) {
// Configure the solve.
ceres::Solver::Options solver_options;
- solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY;
+ solver_options.linear_solver_type = ceres::DENSE_QR;
solver_options.max_num_iterations = 50;
solver_options.update_state_every_iteration = true;
solver_options.gradient_tolerance = 1e-36;
Modified: trunk/blender/extern/libmv/libmv/tracking/track_region.cc
===
--- trunk/blender/extern/libmv/libmv/tracking/track_region.cc 2013-03-05
09:38:43 UTC (rev 55049)
+++ trunk/blender/extern/libmv/libmv/tracking/track_region.cc 2013-03-05
09:38:50 UTC (rev 55050)
@@ -1404,7 +1404,7 @@
// Configure the solve.
ceres::Solver::Options solver_options;
- solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY;
+ solver_options.linear_solver_type = ceres::DENSE_QR;
solver_options.max_num_iterations = options.max_iterations;
solver_options.update_state_every_iteration = true;
solver_options.parameter_tolerance = 1e-16;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55049] trunk/blender/extern/libmv/ third_party/ceres: Update Ceres to 1.5RC3
Revision: 55049 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55049 Author: nazgul Date: 2013-03-05 09:38:43 + (Tue, 05 Mar 2013) Log Message: --- Update Ceres to 1.5RC3 It brings optimization of DENSE_QR and DENSE_SCHUR solvers. Modified Paths: -- trunk/blender/extern/libmv/third_party/ceres/ChangeLog trunk/blender/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h trunk/blender/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h trunk/blender/extern/libmv/third_party/ceres/include/ceres/problem.h trunk/blender/extern/libmv/third_party/ceres/include/ceres/solver.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/evaluator.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/mutex.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/residual_block.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility.cc trunk/blender/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h Modified: trunk/blender/extern/libmv/third_party/ceres/ChangeLog === --- trunk/blender/extern/libmv/third_party/ceres/ChangeLog 2013-03-05 09:34:17 UTC (rev 55048) +++ trunk/blender/extern/libmv/third_party/ceres/ChangeLog 2013-03-05 09:38:43 UTC (rev 55049) @@ -1,3 +1,251 @@ +commit e7148795c3f2ce1f6625a7c81545707a6cbde3eb +Author: Sameer Agarwal +Date: Mon Mar 4 10:17:30 2013 -0800 + +Fix a memory leak in CXSparse::SolveCholesky. + +Thanks to Alexander Mordvintsev for reporting this. + +Change-Id: I5c6be4d3d28f062e83a1ad41cb8089c19362a005 + +commit 480f9b8551c02c429bc027197f3d868c5cc522c9 +Author: Sameer Agarwal
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55048] trunk/blender/source/blender/ editors/space_node/node_relationships.c: Sanity check in the cut-links operator, make sure preview jobs are not
Revision: 55048
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55048
Author: lukastoenne
Date: 2013-03-05 09:34:17 + (Tue, 05 Mar 2013)
Log Message:
---
Sanity check in the cut-links operator, make sure preview jobs are not running
before modifying the node tree.
Modified Paths:
--
trunk/blender/source/blender/editors/space_node/node_relationships.c
Modified: trunk/blender/source/blender/editors/space_node/node_relationships.c
===
--- trunk/blender/source/blender/editors/space_node/node_relationships.c
2013-03-05 09:34:14 UTC (rev 55047)
+++ trunk/blender/source/blender/editors/space_node/node_relationships.c
2013-03-05 09:34:17 UTC (rev 55048)
@@ -840,7 +840,9 @@
if (i > 1) {
int found = FALSE;
bNodeLink *link, *next;
-
+
+ ED_preview_kill_jobs(C);
+
for (link = snode->edittree->links.first; link; link = next) {
next = link->next;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55047] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix #34507, adding reroute node into invalid links would crash the compositor.
Revision: 55047 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55047 Author: lukastoenne Date: 2013-03-05 09:34:14 + (Tue, 05 Mar 2013) Log Message: --- Fix #34507, adding reroute node into invalid links would crash the compositor. Compositor relies on correctly tagged invalid links, but the nodeInternalRelink function used to replace reroute nodes in localization did not correctly take this flag into account. If a node replaces a link with an invalid upstream link the resulting link must also be flagged invalid. Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/node.c Modified: trunk/blender/source/blender/blenkernel/intern/node.c === --- trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-05 07:39:52 UTC (rev 55046) +++ trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-05 09:34:14 UTC (rev 55047) @@ -571,6 +571,12 @@ link->fromnode = fromlink->fromnode; link->fromsock = fromlink->fromsock; + /* if the up- or downstream link is invalid, +* the replacement link will be invalid too. +*/ + if (!(fromlink->flag & NODE_LINK_VALID)) + link->flag &= ~NODE_LINK_VALID; + ntree->update |= NTREE_UPDATE_LINKS; } else ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
