[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35991] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: fix [#26756] Release confirms breaks marker functionality in Timeline
Revision: 35991
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35991
Author: campbellbarton
Date: 2011-04-04 07:42:08 + (Mon, 04 Apr 2011)
Log Message:
---
fix [#26756] Release confirms breaks marker functionality in Timeline
Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-04 05:47:04 UTC (rev 35990)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-04 07:42:08 UTC (rev 35991)
@@ -2145,6 +2145,13 @@
return 1;
}
}
+ else {
+ /* if the initial event wasn't a tweak event then
+* ignore USER_RELEASECONFIRM setting: see [#26756] */
+ if(ELEM3(tweak_event, EVT_TWEAK_L, EVT_TWEAK_M,
EVT_TWEAK_R) == 0) {
+ return 1;
+ }
+ }
}
else {
/* this is fine as long as not doing km-release, otherwise
___
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 [35992] trunk/blender/release/scripts/ startup/bl_ui/space_view3d_toolbar.py: minor edits to view3d toolbar
Revision: 35992 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35992 Author: campbellbarton Date: 2011-04-04 08:47:31 + (Mon, 04 Apr 2011) Log Message: --- minor edits to view3d toolbar Modified Paths: -- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py === --- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-04-04 07:42:08 UTC (rev 35991) +++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-04-04 08:47:31 UTC (rev 35992) @@ -173,7 +173,7 @@ ob = context.active_object if ob: -mesh = context.active_object.data +mesh = ob.data col = layout.column(align=True) col.prop(mesh, use_mirror_x) sub = col.column() @@ -1136,6 +1136,8 @@ def draw(self, context): layout = self.layout +ob = context.active_object +mesh = ob.data ipaint = context.tool_settings.image_paint settings = context.tool_settings.image_paint use_projection = ipaint.use_projection @@ -1163,7 +1165,7 @@ row2 = row.row(align=False) row2.active = (use_projection and ipaint.use_stencil_layer) -row2.menu(VIEW3D_MT_tools_projectpaint_stencil, text=context.active_object.data.uv_texture_stencil.name) +row2.menu(VIEW3D_MT_tools_projectpaint_stencil, text=mesh.uv_texture_stencil.name) row2.prop(ipaint, invert_stencil, text=, icon='IMAGE_ALPHA') col = layout.column() @@ -1172,7 +1174,7 @@ row.active = (settings.brush.image_tool == 'CLONE') row.prop(ipaint, use_clone_layer, text=Layer) -row.menu(VIEW3D_MT_tools_projectpaint_clone, text=context.active_object.data.uv_texture_clone.name) +row.menu(VIEW3D_MT_tools_projectpaint_clone, text=mesh.uv_texture_clone.name) sub = col.column() sub.prop(ipaint, seam_bleed) ___ 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 [35993] trunk/blender/source/blender/ editors/gpencil/gpencil_buttons.c: fix [#26774] Grease Pencil error?
Revision: 35993
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35993
Author: campbellbarton
Date: 2011-04-04 09:22:06 + (Mon, 04 Apr 2011)
Log Message:
---
fix [#26774] Grease Pencil error?
own error with recent change to grease pencil.
Modified Paths:
--
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
2011-04-04 08:47:31 UTC (rev 35992)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
2011-04-04 09:22:06 UTC (rev 35993)
@@ -88,6 +88,14 @@
WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX
please work!
}
+static void gp_ui_actlayer_cb (bContext *C, void *gpd, void *gpl)
+{
+ /* make sure the layer we want to remove is the active one */
+ gpencil_layer_setactive(gpd, gpl);
+
+ WM_event_add_notifier(C, NC_SCREEN|ND_GPENCIL|NA_EDITED, NULL); // XXX
please work!
+}
+
/* --- Drawing Code --- */
/* draw the controls for a given layer */
@@ -122,9 +130,11 @@
subrow= uiLayoutRow(row, 0);
/* active */
+ block= uiLayoutGetBlock(subrow);
icon= (gpl-flag GP_LAYER_ACTIVE) ? ICON_RADIOBUT_ON :
ICON_RADIOBUT_OFF;
- uiItemR(subrow, ptr, active, 0, , icon);
-
+ but= uiDefIconBut(block, BUT, 0, icon, 0, 0, UI_UNIT_X, UI_UNIT_Y,
NULL, 0.0, 0.0, 0.0, 0.0, Set active layer);
+ uiButSetFunc(but, gp_ui_activelayer_cb, gpd, gpl);
+
/* locked */
icon= (gpl-flag GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
uiItemR(subrow, ptr, lock, 0, , icon);
___
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 [35994] trunk/blender/release/scripts/ startup/bl_ui: fix [#26754] Live Edit and Editing UI scripts don't work
Revision: 35994
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35994
Author: campbellbarton
Date: 2011-04-04 10:13:04 + (Mon, 04 Apr 2011)
Log Message:
---
fix [#26754] Live Edit and Editing UI scripts don't work
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_material.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_softbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/release/scripts/startup/bl_ui/properties_world.py
trunk/blender/release/scripts/startup/bl_ui/space_console.py
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_filebrowser.py
trunk/blender/release/scripts/startup/bl_ui/space_graph.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_info.py
trunk/blender/release/scripts/startup/bl_ui/space_logic.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_outliner.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_text.py
trunk/blender/release/scripts/startup/bl_ui/space_time.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
2011-04-04 09:22:06 UTC (rev 35993)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
2011-04-04 10:13:04 UTC (rev 35994)
@@ -92,3 +92,6 @@
col = split.column()
col.label(text=Display:)
col.prop(arm, show_only_ghost_selected, text=Selected Only)
+
+if __name__ == __main__: # only for live edit.
+bpy.utils.register_module(__name__)
Modified:
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
2011-04-04 09:22:06 UTC (rev 35993)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
2011-04-04 10:13:04 UTC (rev 35994)
@@ -310,3 +310,6 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
_context_path = object.data
_property_type = bpy.types.Armature
+
+if __name__ == __main__: # only for live edit.
+bpy.utils.register_module(__name__)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
2011-04-04 09:22:06 UTC (rev 35993)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
2011-04-04 10:13:04 UTC (rev 35994)
@@ -368,3 +368,6 @@
return active_pose_bone
else:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35995] trunk/blender/source/blender: Revert mesh recalculation change that gives different vertex normals based
Revision: 35995
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35995
Author: blendix
Date: 2011-04-04 13:02:12 + (Mon, 04 Apr 2011)
Log Message:
---
Revert mesh recalculation change that gives different vertex normals based
on smooth/flat flag on faces. This does give better results for low poly
game models, but there's just too much functionality that depends on this
(modifiers, displacey, editmode tools, extrude, ...), that there's not
enough time to fix these before the release.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-04-04
10:13:04 UTC (rev 35994)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-04-04
13:02:12 UTC (rev 35995)
@@ -44,7 +44,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather then defining with quotes */
#define BLENDER_VERSION256
-#define BLENDER_SUBVERSION 5
+#define BLENDER_SUBVERSION 6
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-04-04
10:13:04 UTC (rev 35994)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-04-04
13:02:12 UTC (rev 35995)
@@ -1277,61 +1277,22 @@
float (*tnorms)[3]= MEM_callocN(numVerts*sizeof(*tnorms), tnorms);
float (*fnors)[3]= (faceNors_r)? faceNors_r:
MEM_callocN(sizeof(*fnors)*numFaces, meshnormals);
int i;
- int found_flat=0;
for(i=0; inumFaces; i++) {
MFace *mf= mfaces[i];
float *f_no= fnors[i];
+ float *n4 = (mf-v4)? tnorms[mf-v4]: NULL;
+ float *c4 = (mf-v4)? mverts[mf-v4].co: NULL;
if(mf-v4)
normal_quad_v3(f_no, mverts[mf-v1].co,
mverts[mf-v2].co, mverts[mf-v3].co, mverts[mf-v4].co);
else
normal_tri_v3(f_no, mverts[mf-v1].co,
mverts[mf-v2].co, mverts[mf-v3].co);
- if(mf-flag ME_SMOOTH) {
- float *n4 = (mf-v4)? tnorms[mf-v4]: NULL;
- float *c4 = (mf-v4)? mverts[mf-v4].co: NULL;
-
- accumulate_vertex_normals(tnorms[mf-v1],
tnorms[mf-v2], tnorms[mf-v3], n4,
- f_no, mverts[mf-v1].co, mverts[mf-v2].co,
mverts[mf-v3].co, c4);
- }
- else {
- found_flat=1;
- }
+ accumulate_vertex_normals(tnorms[mf-v1], tnorms[mf-v2],
tnorms[mf-v3], n4,
+ f_no, mverts[mf-v1].co, mverts[mf-v2].co,
mverts[mf-v3].co, c4);
}
- /* build smooth normals for uninitialized normals at faces set to flat
*/
- /* For such faces the renderer/3Dview and exporters will be using the
face normal */
- /* The vertex normals built inside this if-statement are entirely to
support the needs of the modeler */
- if(found_flat!=0) {
- const int nr_bits= sizeof(int)*8;
- const int nr_words= (numVerts+(nr_bits-1))/nr_bits;
- int *bit_array= (int*)MEM_callocN(sizeof(int)*MAX2(nr_words,
1), temp buffer);
-
- for(i=0; inumFaces; i++) {
- MFace *mf= mfaces[i];
-
- if(!(mf-flag ME_SMOOTH)) {
- if(is_zero_v3(tnorms[mf-v1]))
bit_array[mf-v1/nr_bits]|=(1(mf-v1(nr_bits-1)));
- if(is_zero_v3(tnorms[mf-v2]))
bit_array[mf-v2/nr_bits]|=(1(mf-v2(nr_bits-1)));
- if(is_zero_v3(tnorms[mf-v3]))
bit_array[mf-v3/nr_bits]|=(1(mf-v3(nr_bits-1)));
- if(mf-v4 is_zero_v3(tnorms[mf-v4]))
bit_array[mf-v4/nr_bits]|=(1(mf-v4(nr_bits-1)));
- }
- }
-
- for(i=0; inumFaces; i++) {
- MFace *mf= mfaces[i];
- float *f_no= fnors[i];
-
- if(bit_array[mf-v1/nr_bits](1(mf-v1(nr_bits-1
add_v3_v3(tnorms[mf-v1], f_no);
- if(bit_array[mf-v2/nr_bits](1(mf-v2(nr_bits-1
add_v3_v3(tnorms[mf-v2], f_no);
- if(bit_array[mf-v3/nr_bits](1(mf-v3(nr_bits-1
add_v3_v3(tnorms[mf-v3], f_no);
- if(mf-v4
bit_array[mf-v4/nr_bits](1(mf-v4(nr_bits-1 add_v3_v3(tnorms[mf-v4],
f_no);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35996] trunk/blender/source/blender/ makesrna/intern/rna_particle.c: Fix for [#26750] Particles Can Only Address first 16 Material Indexes
Revision: 35996 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35996 Author: jhk Date: 2011-04-04 13:33:31 + (Mon, 04 Apr 2011) Log Message: --- Fix for [#26750] Particles Can Only Address first 16 Material Indexes * The rna maximum hadn't been updated when the maximum material count was increased. Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_particle.c Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c === --- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2011-04-04 13:02:12 UTC (rev 35995) +++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2011-04-04 13:33:31 UTC (rev 35996) @@ -1922,7 +1922,7 @@ prop= RNA_def_property(srna, material, PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, omat); - RNA_def_property_range(prop, 1, 16); + RNA_def_property_range(prop, 1, 32767); RNA_def_property_ui_text(prop, Material, Specify material used for the particles); RNA_def_property_update(prop, 0, rna_Particle_redo); ___ 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 [35997] trunk/blender/source/blender/ makesrna/intern/rna_particle.c: Fix for [#26747] Crash accessing dynamic hair RNA
Revision: 35997
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35997
Author: jhk
Date: 2011-04-04 13:47:28 + (Mon, 04 Apr 2011)
Log Message:
---
Fix for [#26747] Crash accessing dynamic hair RNA
* Removed hairkey.co_dynamic. The hairkey access is now simplified so that
hairkey.co are the dynamic coordinates whenever the hair is dynamic.
Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_particle.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2011-04-04
13:33:31 UTC (rev 35996)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2011-04-04
13:47:28 UTC (rev 35997)
@@ -183,58 +183,17 @@
rna_ParticleHairKey_location_object_info(ptr, psmd, pa);
if(pa) {
- float hairmat[4][4];
- psys_mat_hair_to_object(ob, psmd-dm, psmd-psys-part-from,
pa, hairmat);
- copy_v3_v3(values, hkey-co);
- mul_m4_v3(hairmat, values);
- }
- else {
- zero_v3(values);
- }
-}
+ DerivedMesh *hairdm = (psmd-psys-flag PSYS_HAIR_DYNAMICS) ?
psmd-psys-hair_out_dm : NULL;
-static void rna_ParticleHairKey_location_object_set(PointerRNA *ptr, const
float *values)
-{
- HairKey *hkey= (HairKey *)ptr-data;
- Object *ob = (Object *)ptr-id.data;
- ParticleSystemModifierData *psmd;
- ParticleData *pa;
-
- rna_ParticleHairKey_location_object_info(ptr, psmd, pa);
-
- if(pa) {
- float hairmat[4][4];
- float imat[4][4];
-
- psys_mat_hair_to_object(ob, psmd-dm, psmd-psys-part-from,
pa, hairmat);
- invert_m4_m4(imat, hairmat);
- copy_v3_v3(hkey-co, values);
- mul_m4_v3(imat, hkey-co);
- }
- else {
- zero_v3(hkey-co);
- }
-}
-
-static void rna_ParticleHairKey_dynamic_location_object_get(PointerRNA *ptr,
float *values)
-{
- HairKey *hkey= (HairKey *)ptr-data;
- // Object *ob = (Object *)ptr-id.data;
- ParticleSystemModifierData *psmd;
- ParticleData *pa;
-
- rna_ParticleHairKey_location_object_info(ptr, psmd, pa);
-
- if(pa) {
- ParticleSystem *psys = psmd-psys;
- DerivedMesh *hairdm = (psys-flag PSYS_HAIR_DYNAMICS) ?
psys-hair_out_dm : NULL;
-
if(hairdm) {
MVert *mvert = CDDM_get_vert(hairdm, pa-hair_index +
(hkey - pa-hair));
copy_v3_v3(values, mvert-co);
}
else {
- rna_ParticleHairKey_dynamic_location_object_get(ptr,
values);
+ float hairmat[4][4];
+ psys_mat_hair_to_object(ob, psmd-dm,
psmd-psys-part-from, pa, hairmat);
+ copy_v3_v3(values, hkey-co);
+ mul_m4_v3(hairmat, values);
}
}
else {
@@ -242,25 +201,30 @@
}
}
-static void rna_ParticleHairKey_dynamic_location_object_set(PointerRNA *ptr,
const float *values)
+static void rna_ParticleHairKey_location_object_set(PointerRNA *ptr, const
float *values)
{
HairKey *hkey= (HairKey *)ptr-data;
- // Object *ob = (Object *)ptr-id.data;
+ Object *ob = (Object *)ptr-id.data;
ParticleSystemModifierData *psmd;
ParticleData *pa;
rna_ParticleHairKey_location_object_info(ptr, psmd, pa);
if(pa) {
- ParticleSystem *psys = psmd-psys;
- DerivedMesh *hairdm = (psys-flag PSYS_HAIR_DYNAMICS) ?
psys-hair_out_dm : NULL;
+ DerivedMesh *hairdm = (psmd-psys-flag PSYS_HAIR_DYNAMICS) ?
psmd-psys-hair_out_dm : NULL;
if(hairdm) {
MVert *mvert = CDDM_get_vert(hairdm, pa-hair_index +
(hkey - pa-hair));
copy_v3_v3(mvert-co, values);
}
else {
- rna_ParticleHairKey_dynamic_location_object_set(ptr,
values);
+ float hairmat[4][4];
+ float imat[4][4];
+
+ psys_mat_hair_to_object(ob, psmd-dm,
psmd-psys-part-from, pa, hairmat);
+ invert_m4_m4(imat, hairmat);
+ copy_v3_v3(hkey-co, values);
+ mul_m4_v3(imat, hkey-co);
}
}
else {
@@ -941,11 +905,6 @@
prop= RNA_def_property(srna, co_hair_space, PROP_FLOAT,
PROP_TRANSLATION);
RNA_def_property_float_sdna(prop, NULL, co);
RNA_def_property_ui_text(prop, Location, Location of the hair key in
its internal coordinate system, relative to the emitting face);
-
- prop= RNA_def_property(srna, co_dynamic, PROP_FLOAT,
PROP_TRANSLATION);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35998] trunk/blender/source/blender: Bugfix #26761
Revision: 35998
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35998
Author: ton
Date: 2011-04-04 13:47:34 + (Mon, 04 Apr 2011)
Log Message:
---
Bugfix #26761
Texture preview render now doesn't increment/decrement material-texture
user counts anymore. Blenders library.c code could use some overhaul
once to support data relinkage and copying around better. :)
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/editors/render/render_preview.c
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===
--- trunk/blender/source/blender/blenkernel/intern/material.c 2011-04-04
13:47:28 UTC (rev 35997)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2011-04-04
13:47:34 UTC (rev 35998)
@@ -245,12 +245,11 @@
man= copy_libblock(ma);
BLI_remlink(G.main-mat, man);
+ /* no increment for texture ID users, in previewrender.c it prevents
decrement */
for(a=0; aMAX_MTEX; a++) {
if(ma-mtex[a]) {
man-mtex[a]= MEM_mallocN(sizeof(MTex), copymaterial);
memcpy(man-mtex[a], ma-mtex[a], sizeof(MTex));
- /* free_material decrements! */
- id_us_plus((ID *)man-mtex[a]-tex);
}
}
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===
--- trunk/blender/source/blender/editors/render/render_preview.c
2011-04-04 13:47:28 UTC (rev 35997)
+++ trunk/blender/source/blender/editors/render/render_preview.c
2011-04-04 13:47:34 UTC (rev 35998)
@@ -1117,11 +1117,20 @@
if(sp-matcopy) {
struct IDProperty *properties;
+ int a;
+
/* node previews */
shader_preview_updatejob(sp);
/* get rid of copied material */
BLI_remlink(pr_main-mat, sp-matcopy);
+
+ /* free_material decrements texture, prevent this. hack alert!
*/
+ for(a=0; aMAX_MTEX; a++) {
+ MTex *mtex= sp-matcopy-mtex[a];
+ if(mtex mtex-tex) mtex-tex= NULL;
+ }
+
free_material(sp-matcopy);
properties= IDP_GetProperties((ID *)sp-matcopy, FALSE);
___
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 [35999] trunk/blender/release/scripts/ startup/bl_operators/object_quick_effects.py: Bug fix: The quick effect operators got broken a bit by the new m
Revision: 35999
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=35999
Author: jhk
Date: 2011-04-04 14:35:22 + (Mon, 04 Apr 2011)
Log Message:
---
Bug fix: The quick effect operators got broken a bit by the new material slot
behavior.
* The operators now add new materials and assign them to the created material
slots explicitly.
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
Modified:
trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
===
--- trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
2011-04-04 13:47:34 UTC (rev 35998)
+++ trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
2011-04-04 14:35:22 UTC (rev 35999)
@@ -163,8 +163,8 @@
# create a volume material with a voxel data texture for the domain
bpy.ops.object.material_slot_add({object: obj})
-mat = obj.material_slots[0].material
-mat.name = Smoke Domain Material
+mat = bpy.data.materials.new(Smoke Domain Material);
+obj.material_slots[0].material = mat
mat.type = 'VOLUME'
mat.volume.density = 0
mat.volume.density_scale = 5
@@ -274,9 +274,10 @@
# create a ray-transparent material for the domain
bpy.ops.object.material_slot_add({object: obj})
+
+mat = bpy.data.materials.new(Fluid Domain Material);
+obj.material_slots[0].material = mat
-mat = obj.material_slots[0].material
-mat.name = Fluid Domain Material
mat.specular_intensity = 1
mat.specular_hardness = 100
mat.use_transparency = True
___
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 [36000] trunk/blender/source/blender/ editors/interface/interface_widgets.c: UI fix:
Revision: 36000
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36000
Author: ton
Date: 2011-04-04 15:01:22 + (Mon, 04 Apr 2011)
Log Message:
---
UI fix:
On dark menu backgrounds, the labels for Option buttons were not using
the theme colors for 'text on menu backdrop'.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2011-04-04 14:35:22 UTC (rev 35999)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2011-04-04 15:01:22 UTC (rev 36000)
@@ -1554,6 +1554,24 @@
}
+/* labels use theme colors for text */
+static void widget_state_option_menu(uiWidgetType *wt, int state)
+{
+
+ /* call this for option button */
+ widget_state(wt, state);
+
+ /* if not selected we get theme from menu back */
+ if(state UI_SELECT)
+ UI_GetThemeColor4ubv(TH_TEXT_HI, (unsigned char
*)wt-wcol.text);
+ else {
+ bTheme *btheme= U.themes.first; /* XXX */
+
+ VECCOPY(wt-wcol.text, btheme-tui.wcol_menu_back.text);
+ }
+}
+
+
static void widget_state_nothing(uiWidgetType *wt, int UNUSED(state))
{
wt-wcol= *(wt-wcol_theme);
@@ -2938,6 +2956,11 @@
}
else
wt= widget_type(UI_WTYPE_TOGGLE);
+
+ /* option buttons have strings outside, on
menus use different colors */
+ if(but-block-flag UI_BLOCK_LOOP)
+ wt-state= widget_state_option_menu;
+
break;
case MENU:
___
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 [36001] trunk/blender/source/blender/ editors: crash fix: screen context editable_bones visible_bones were not checking for armature type object fir
Revision: 36001
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36001
Author: campbellbarton
Date: 2011-04-04 15:13:37 + (Mon, 04 Apr 2011)
Log Message:
---
crash fix: screen context editable_bones visible_bones were not checking for
armature type object first.
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/screen/screen_context.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04
15:01:22 UTC (rev 36000)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04
15:13:37 UTC (rev 36001)
@@ -2006,8 +2006,8 @@
zero_v3(eve-no);
for(efa= em-faces.first; efa; efa=efa-next) {
- float *n4= (efa-v4)? efa-v4-no: NULL;
- float *c4= (efa-v4)? efa-v4-co: NULL;
+ // float *n4= (efa-v4)? efa-v4-no: NULL;
+ // float *c4= (efa-v4)? efa-v4-co: NULL;
if(efa-v4) {
normal_quad_v3(efa-n, efa-v1-co, efa-v2-co,
efa-v3-co, efa-v4-co);
Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===
--- trunk/blender/source/blender/editors/screen/screen_context.c
2011-04-04 15:01:22 UTC (rev 36000)
+++ trunk/blender/source/blender/editors/screen/screen_context.c
2011-04-04 15:13:37 UTC (rev 36001)
@@ -154,7 +154,7 @@
return 1;
}
else if(CTX_data_equals(member, visible_bones) ||
CTX_data_equals(member, editable_bones)) {
- bArmature *arm= (obedit) ? obedit-data : NULL;
+ bArmature *arm= (obedit obedit-type == OB_ARMATURE) ?
obedit-data : NULL;
EditBone *ebone, *flipbone=NULL;
int editable_bones= CTX_data_equals(member, editable_bones);
@@ -196,7 +196,7 @@
}
}
else if(CTX_data_equals(member, selected_bones) ||
CTX_data_equals(member, selected_editable_bones)) {
- bArmature *arm= (obedit) ? obedit-data : NULL;
+ bArmature *arm= (obedit obedit-type == OB_ARMATURE) ?
obedit-data : NULL;
EditBone *ebone, *flipbone=NULL;
int selected_editable_bones= CTX_data_equals(member,
selected_editable_bones);
___
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 [36002] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: Fix for redraw issues when making fast strokes with grab tool in sculpt mode
Revision: 36002
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36002
Author: nazgul
Date: 2011-04-04 15:15:45 + (Mon, 04 Apr 2011)
Log Message:
---
Fix for redraw issues when making fast strokes with grab tool in sculpt mode
Join redraw rectangles from previous step and current during one stroke
and reset previous rectangle when stroke is finished. This shouldn't cause
problems
with viewport changes during the sculpt session and this should emulate
object boundbox merging for states before step and after step.
At leastm it's more logical because boundbox could not only grow up during
stroke, but it could also shrink down.
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-04-04
15:13:37 UTC (rev 36001)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-04-04
15:15:45 UTC (rev 36002)
@@ -263,6 +263,8 @@
int alt_smooth;
float plane_trim_squared;
+
+ rcti previous_r; /* previous redraw rectangle */
} StrokeCache;
/*** BVH Tree ***/
@@ -3403,19 +3405,19 @@
BLI_pbvh_update(ss-pbvh, PBVH_UpdateBB, NULL);
if (sculpt_get_redraw_rect(ar, CTX_wm_region_view3d(C), ob,
r)) {
- //rcti tmp;
-
r.xmin += ar-winrct.xmin + 1;
r.xmax += ar-winrct.xmin - 1;
r.ymin += ar-winrct.ymin + 1;
r.ymax += ar-winrct.ymin - 1;
- //tmp = r;
+ if (ss-cache) {
+ rcti tmp = r;
- //if (!BLI_rcti_is_empty(ss-previous_r))
- // BLI_union_rcti(r, ss-previous_r);
+ if (!BLI_rcti_is_empty(ss-cache-previous_r))
+ BLI_union_rcti(r,
ss-cache-previous_r);
- //ss-previous_r= tmp;
+ ss-cache-previous_r= tmp;
+ }
ss-partial_redraw = 1;
ED_region_tag_redraw_partial(ar, r);
___
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 [36003] trunk/blender/source/blender/ editors/render/render_shading.c: Fix #26781: Assigning multiple Materials to Text seems not to work correctly
Revision: 36003
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36003
Author: nazgul
Date: 2011-04-04 16:19:18 + (Mon, 04 Apr 2011)
Log Message:
---
Fix #26781: Assigning multiple Materials to Text seems not to work correctly
Problems was in 0-based numbering vs. 1-based. Fonts are getting converted to
displists when they're displaying and here base conversion happens, so no need
in conversion when assigning material to selected text.
This makes indices more inconsistant, but saves compatibility in both of
directions. Maybe in further releases we'll make indices consistent.
Modified Paths:
--
trunk/blender/source/blender/editors/render/render_shading.c
Modified: trunk/blender/source/blender/editors/render/render_shading.c
===
--- trunk/blender/source/blender/editors/render/render_shading.c
2011-04-04 15:15:45 UTC (rev 36002)
+++ trunk/blender/source/blender/editors/render/render_shading.c
2011-04-04 16:19:18 UTC (rev 36003)
@@ -359,7 +359,7 @@
if(ef BKE_font_getselection(ob, selstart, selend))
{
for(i=selstart; i=selend; i++)
- ef-textbufinfo[i].mat_nr =
ob-actcol-1;
+ ef-textbufinfo[i].mat_nr = ob-actcol;
}
}
}
___
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 [36004] trunk/blender/source/blender/ editors/datafiles/startup.blend.c: Startup.blend update:
Revision: 36004
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36004
Author: ton
Date: 2011-04-04 16:58:17 + (Mon, 04 Apr 2011)
Log Message:
---
Startup.blend update:
- Clip in 3d window now 1000 (2nd try :)
- Raytrace Instances default
Modified Paths:
--
trunk/blender/source/blender/editors/datafiles/startup.blend.c
Modified: trunk/blender/source/blender/editors/datafiles/startup.blend.c
===
--- trunk/blender/source/blender/editors/datafiles/startup.blend.c
2011-04-04 16:19:18 UTC (rev 36003)
+++ trunk/blender/source/blender/editors/datafiles/startup.blend.c
2011-04-04 16:58:17 UTC (rev 36004)
@@ -1,956 +1,961 @@
/* DataToC output of file startup_blend */
-int datatoc_startup_blend_size= 359988;
+int datatoc_startup_blend_size= 364712;
char datatoc_startup_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 95, 86, 50, 53, 54, 82, 69, 78, 68, 0, 0, 0,
32,
-191,255,231,240, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
0,250, 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79, 66, 0, 0, 1,
24,191,255,230,232, 0, 0, 0,196, 0, 0, 0, 1,
- 32, 32, 32, 53, 0, 5, 0, 0, 0,250, 0, 0, 0, 1, 1, 0, 4,213,
9,160, 2,153, 90, 32, 0, 0, 16, 0, 0, 4, 32,128,
- 0, 0,140,131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 66, 76, 69, 78, 68, 69, 82, 95,
+ 86, 50, 53, 54, 82, 69, 78, 68, 0, 0, 0, 32,191,255,232, 16, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,250,
+ 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 71, 76, 79, 66, 0, 0, 1, 24,
+191,255,231, 8, 0, 0, 0,196, 0, 0, 0, 1, 32, 32, 32, 53, 0, 5, 0,
0, 0,250, 0, 0, 0, 1, 1, 0, 10, 73,106, 64,
+ 2,197, 24, 32, 0, 0, 16, 0, 0, 4, 32,128, 0, 0,140,153, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 87, 77, 0, 0, 0,168,
- 4,212,143,224, 0, 0, 1,103, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 77, 87,105,
-110, 77, 97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 4,212,144,176, 4,212,144,176, 4,212,144,176, 4,212,144,176, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
16, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 9,136, 96,208,
- 9,136, 96,208, 9,136, 96,208, 9,177, 18,192, 9,177, 18,192, 9,177,
18,192, 68, 65, 84, 65, 0, 0, 0,148, 4,212,144,176,
- 0, 0, 1,104, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4,209,
42,224, 0, 0, 0, 1, 0, 0, 0, 0, 4,213, 9,160,
- 0, 0, 0, 0,115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 96, 7,128, 4,128, 0, 0, 0, 0, 0, 1,
3,238, 0, 0, 0, 0, 0, 1, 0, 0, 4,209,116,128,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 9,177,
42,128, 10, 18,128, 96, 10, 18,128, 96, 9,177, 20,128,
- 9,177, 19,160, 9,177, 20, 16, 9,177, 20, 16, 10, 17,231,192,
4,216,250,160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 78,
- 0, 0, 0,148, 4,212,145,112, 0, 0, 0,190, 0, 0, 0, 1,
4,212,212,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 83, 82, 65,110,105,109, 97,116,105,111,110, 0, 46, 48, 48, 49, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 10, 28, 48,208, 4,212,148,240, 4,212,149, 48, 4,212,156,
48, 4,212,156,112, 4,212,208, 48, 0, 0, 0, 0,
- 0, 0, 0, 0, 2,153, 90, 32, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36005] trunk/blender/source/blender/ editors/mesh/editmesh_lib.c: Fix mistake in recent commit to revert some normal changes.
Revision: 36005 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36005 Author: blendix Date: 2011-04-04 17:09:22 + (Mon, 04 Apr 2011) Log Message: --- Fix mistake in recent commit to revert some normal changes. Modified Paths: -- trunk/blender/source/blender/editors/mesh/editmesh_lib.c Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c === --- trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04 16:58:17 UTC (rev 36004) +++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04 17:09:22 UTC (rev 36005) @@ -2017,6 +2017,9 @@ normal_tri_v3(efa-n, efa-v1-co, efa-v2-co, efa-v3-co); cent_tri_v3(efa-cent, efa-v1-co, efa-v2-co, efa-v3-co); } + + accumulate_vertex_normals(efa-v1-no, efa-v2-no, efa-v3-no, n4, + efa-n, efa-v1-co, efa-v2-co, efa-v3-co, c4); } /* following Mesh convention; we use vertex coordinate itself for normal in this case */ ___ 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 [36006] trunk/blender/source/blender/ makesrna/intern/rna_image.c: Fix for slow Image.pixels, make it a flat instead of multidimensional array.
Revision: 36006
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36006
Author: blendix
Date: 2011-04-04 17:10:48 + (Mon, 04 Apr 2011)
Log Message:
---
Fix for slow Image.pixels, make it a flat instead of multidimensional array.
Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_image.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_image.c2011-04-04
17:09:22 UTC (rev 36005)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c2011-04-04
17:10:48 UTC (rev 36006)
@@ -251,18 +251,14 @@
ibuf= BKE_image_acquire_ibuf(ima, NULL, lock);
- if(ibuf) {
- length[0]= ibuf-x*ibuf-y;
- length[1]= ibuf-channels;
- }
- else {
+ if(ibuf)
+ length[0]= ibuf-x*ibuf-y*ibuf-channels;
+ else
length[0]= 0;
- length[1]= 0;
- }
BKE_image_release_ibuf(ima, lock);
- return length[0]*length[1];
+ return length[0];
}
static void rna_Image_pixels_get(PointerRNA *ptr, float *values)
@@ -561,7 +557,7 @@
prop= RNA_def_property(srna, pixels, PROP_FLOAT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
- RNA_def_property_multi_array(prop, 2, NULL);
+ RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, Pixels, Image pixels in floating
point values);
RNA_def_property_dynamic_array_funcs(prop,
rna_Image_pixels_get_length);
RNA_def_property_float_funcs(prop, rna_Image_pixels_get,
rna_Image_pixels_set, 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 [36007] trunk/blender/source/blender/ editors/mesh/editmesh_lib.c: Fix for the fix, making hurried last minute changes is not a good idea :)
Revision: 36007
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36007
Author: blendix
Date: 2011-04-04 17:28:31 + (Mon, 04 Apr 2011)
Log Message:
---
Fix for the fix, making hurried last minute changes is not a good idea :)
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04
17:10:48 UTC (rev 36006)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c2011-04-04
17:28:31 UTC (rev 36007)
@@ -2006,8 +2006,8 @@
zero_v3(eve-no);
for(efa= em-faces.first; efa; efa=efa-next) {
- // float *n4= (efa-v4)? efa-v4-no: NULL;
- // float *c4= (efa-v4)? efa-v4-co: NULL;
+ float *n4= (efa-v4)? efa-v4-no: NULL;
+ float *c4= (efa-v4)? efa-v4-co: NULL;
if(efa-v4) {
normal_quad_v3(efa-n, efa-v1-co, efa-v2-co,
efa-v3-co, efa-v4-co);
___
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 [36008] trunk/blender/build_files/buildbot /config: buildbot: static zlib linking
Revision: 36008
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36008
Author: nazgul
Date: 2011-04-04 19:39:47 + (Mon, 04 Apr 2011)
Log Message:
---
buildbot: static zlib linking
Force link to zlib for all platforms/tragets to be sure there'll
be no gzopen64 symbol undefined (it was in some dependend library, so
blenderplayer wasn't working in fedora 13 32bit)
Modified Paths:
--
trunk/blender/build_files/buildbot/config/user-config-i686.py
trunk/blender/build_files/buildbot/config/user-config-player-i686.py
trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
trunk/blender/build_files/buildbot/config/user-config-x86_64.py
Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-04-04 19:39:47 UTC (rev 36008)
@@ -64,8 +64,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
+WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_SDL = True
WITH_BF_OGG = True
Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-player-i686.py
2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py
2011-04-04 19:39:47 UTC (rev 36008)
@@ -42,10 +42,10 @@
WITH_BF_STATICLIBSAMPLERATE = True
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-WITH_BF_STATICZLIB = False
WITH_BF_SDL = True
WITH_BF_OGG = False
Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
2011-04-04 19:39:47 UTC (rev 36008)
@@ -42,8 +42,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_STATICZLIB = False
WITH_BF_SDL = True
Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-04-04 17:28:31 UTC (rev 36007)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-04-04 19:39:47 UTC (rev 36008)
@@ -64,8 +64,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
+WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_SDL = True
WITH_BF_OGG = True
___
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 [36009] trunk/blender/source/blender/ editors/curve/editcurve.c: Descriptions for some of curve operators
Revision: 36009
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36009
Author: nazgul
Date: 2011-04-04 20:31:01 + (Mon, 04 Apr 2011)
Log Message:
---
Descriptions for some of curve operators
Modified Paths:
--
trunk/blender/source/blender/editors/curve/editcurve.c
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-04
19:39:47 UTC (rev 36008)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-04
20:31:01 UTC (rev 36009)
@@ -3581,6 +3581,7 @@
/* identifiers */
ot-name= Set Spline Type;
+ ot-description = Set type of actibe spline;
ot-idname= CURVE_OT_spline_type_set;
/* api callbacks */
@@ -3623,6 +3624,7 @@
/* identifiers */
ot-name= Set Handle Type;
+ ot-description = Set type of handles for selected control points;
ot-idname= CURVE_OT_handle_type_set;
/* api callbacks */
@@ -4745,6 +4747,7 @@
{
/* identifiers */
ot-name= Extrude;
+ ot-description = Extrude selected control point(s) and move;
ot-idname= CURVE_OT_extrude;
/* api callbacks */
@@ -4873,6 +4876,7 @@
/* identifiers */
ot-name= Toggle Cyclic;
+ ot-description = Make active spline closed/opened loop;
ot-idname= CURVE_OT_cyclic_toggle;
/* api callbacks */
@@ -5619,6 +5623,7 @@
{
/* identifiers */
ot-name= Duplicate;
+ ot-description = Duplicate selected control points and segments
between them;
ot-idname= CURVE_OT_duplicate;
/* api callbacks */
@@ -5984,6 +5989,7 @@
/* identifiers */
ot-name= Delete;
+ ot-description = Delete selected control points or segments;
ot-idname= CURVE_OT_delete;
/* api callbacks */
___
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 [36010] trunk/blender/source/blender/ editors/space_file/fsmenu.c: == filebrowser ==
Revision: 36010
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36010
Author: elubie
Date: 2011-04-04 20:32:39 + (Mon, 04 Apr 2011)
Log Message:
---
== filebrowser ==
Small fix for recent folders in filebrowser, didn't save correctly when too
many folders in the list (more than the currently allowed 10), now skips the
oldest entries.
Reported on IRC.
Modified Paths:
--
trunk/blender/source/blender/editors/space_file/fsmenu.c
Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===
--- trunk/blender/source/blender/editors/space_file/fsmenu.c2011-04-04
20:31:01 UTC (rev 36009)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c2011-04-04
20:32:39 UTC (rev 36010)
@@ -232,7 +232,7 @@
void fsmenu_write_file(struct FSMenu* fsmenu, const char *filename)
{
FSMenuEntry *fsme= NULL;
- int count=FSMENU_RECENT_MAX;
+ int nskip= 0;
FILE *fp = fopen(filename, w);
if (!fp) return;
@@ -244,7 +244,11 @@
}
}
fprintf(fp, [Recent]\n);
- for (fsme= fsmenu_get_category(fsmenu, FS_CATEGORY_RECENT); fsme
count; fsme= fsme-next, --count) {
+ nskip = fsmenu_get_nentries(fsmenu, FS_CATEGORY_RECENT) -
FSMENU_RECENT_MAX;
+ // skip first entries if list too long
+ for (fsme= fsmenu_get_category(fsmenu, FS_CATEGORY_RECENT); fsme
(nskip0); fsme= fsme-next, --nskip)
+ ;
+ for (; fsme; fsme= fsme-next) {
if (fsme-path fsme-save) {
fprintf(fp, %s\n, fsme-path);
}
___
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 [36012] trunk/blender: quiet warning minor pep8 edits.
Revision: 36012
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36012
Author: campbellbarton
Date: 2011-04-04 22:42:43 + (Mon, 04 Apr 2011)
Log Message:
---
quiet warning minor pep8 edits.
Modified Paths:
--
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/doc/manpage/blender.1
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/tests/bl_test.py
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-04-04
22:40:56 UTC (rev 36011)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-04-04
22:42:43 UTC (rev 36012)
@@ -125,7 +125,6 @@
defines = []
-
create_eclipse_project(CMAKE_DIR)
from xml.dom.minidom import parse
Modified: trunk/blender/doc/manpage/blender.1
===
(Binary files differ)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
2011-04-04 22:42:43 UTC (rev 36012)
@@ -73,7 +73,7 @@
row.prop(dopesheet, show_only_group_objects, text=)
if dopesheet.show_only_group_objects:
row.prop(dopesheet, filter_group, text=)
-
+
if not is_nla:
row = layout.row(align=True)
row.prop(dopesheet, show_only_matching_fcurves, text=)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-04-04
22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-04-04
22:42:43 UTC (rev 36012)
@@ -1052,9 +1052,9 @@
layout.operator(object.vertex_group_invert, text=Invert)
layout.operator(object.vertex_group_clean, text=Clean)
layout.operator(object.vertex_group_levels, text=Levels)
-
+
layout.separator()
-
+
layout.operator(paint.weight_set)
# ** Sculpt menu **
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-04-04 22:42:43 UTC (rev 36012)
@@ -1202,7 +1202,7 @@
def draw(self, context):
layout = self.layout
-
+
tool_settings = context.tool_settings
col = layout.column()
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-04-04
22:40:56 UTC (rev 36011)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-04-04
22:42:43 UTC (rev 36012)
@@ -1028,7 +1028,6 @@
size_t in_len;
#ifdef WITH_LZO
size_t out_len = len;
- size_t sizeOfIt = 5;
#endif
unsigned char *in;
unsigned char *props = MEM_callocN(16*sizeof(char), tmp);
@@ -1051,6 +1050,7 @@
#ifdef WITH_LZMA
if(compressed == 2)
{
+ size_t sizeOfIt;
size_t leni = in_len, leno = out_len;
ptcache_file_read(pf, size, 1, sizeof(unsigned
int));
sizeOfIt = (size_t)size;
Modified: trunk/blender/source/tests/bl_test.py
===
--- trunk/blender/source/tests/bl_test.py 2011-04-04 22:40:56 UTC (rev
36011)
+++ trunk/blender/source/tests/bl_test.py 2011-04-04 22:42:43 UTC (rev
36012)
@@ -170,7 +170,9 @@
md5_update = md5_instance.update
for f in md5_source:
-md5_update(open(f, rb).read())
+filehandle = open(f, rb)
+md5_update(filehandle.read())
+filehandle.close()
md5_new = md5_instance.hexdigest()
___
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 [36013] trunk/blender/source/blender/ editors: utility function for getting the vector direction the mouse is pointing in a perspective view .
Revision: 36013
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36013
Author: campbellbarton
Date: 2011-04-05 02:58:19 + (Tue, 05 Apr 2011)
Log Message:
---
utility function for getting the vector direction the mouse is pointing in a
perspective view.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===
--- trunk/blender/source/blender/editors/include/ED_view3d.h2011-04-04
22:42:43 UTC (rev 36012)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h2011-04-05
02:58:19 UTC (rev 36013)
@@ -82,6 +82,7 @@
int initgrabz(struct RegionView3D *rv3d, float x, float y, float z);
void window_to_3d(struct ARegion *ar, float *vec, short mx, short my);
void window_to_3d_delta(struct ARegion *ar, float *vec, short mx, short my);
+void window_to_3d_vector(struct ARegion *ar, float *vec, short mx, short my);
void view3d_unproject(struct bglMats *mats, float out[3], const short x, const
short y, const float z);
/* Depth buffer */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-04-04 22:42:43 UTC (rev 36012)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-04-05 02:58:19 UTC (rev 36013)
@@ -677,6 +677,28 @@
vec[2]= (rv3d-persinv[0][2]*dx + rv3d-persinv[1][2]*dy);
}
+/* doesn't rely on initgrabz */
+/* for perspective view, get the vector direction to
+ * the mouse cursor as a normalized vector */
+void window_to_3d_vector(ARegion *ar, float *vec, short mx, short my)
+{
+ RegionView3D *rv3d= ar-regiondata;
+ float dx, dy;
+ float viewvec[3];
+
+ dx= 2.0f*mx/ar-winx;
+ dy= 2.0f*my/ar-winy;
+
+ /* normalize here so vecs are proportional to eachother */
+ normalize_v3_v3(viewvec, rv3d-viewinv[2]);
+
+ vec[0]= viewvec[0] - (rv3d-persinv[0][0]*dx + rv3d-persinv[1][0]*dy);
+ vec[1]= viewvec[1] - (rv3d-persinv[0][1]*dx + rv3d-persinv[1][1]*dy);
+ vec[2]= viewvec[2] - (rv3d-persinv[0][2]*dx + rv3d-persinv[1][2]*dy);
+
+ normalize_v3(vec);
+}
+
float read_cached_depth(ViewContext *vc, int x, int y)
{
ViewDepths *vd = vc-rv3d-depths;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
