[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44986] branches/asset-browser: merge revisions 44973-44985 from trunk
Andrea Weikert
elubie at gmx.net
Mon Mar 19 06:56:08 CET 2012
Revision: 44986
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44986
Author: elubie
Date: 2012-03-19 05:55:59 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
merge revisions 44973-44985 from trunk
Modified Paths:
--------------
branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py
branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h
branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
branches/asset-browser/source/blender/blenkernel/BKE_multires.h
branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.c
branches/asset-browser/source/blender/blenkernel/intern/dynamicpaint.c
branches/asset-browser/source/blender/blenkernel/intern/multires.c
branches/asset-browser/source/blender/blenkernel/intern/particle_system.c
branches/asset-browser/source/blender/blenkernel/intern/pointcache.c
branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
branches/asset-browser/source/blender/blenkernel/intern/subsurf_ccg.c
branches/asset-browser/source/blender/blenloader/intern/readfile.c
branches/asset-browser/source/blender/bmesh/CMakeLists.txt
branches/asset-browser/source/blender/bmesh/intern/bmesh_opdefines.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_operators_private.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.h
branches/asset-browser/source/blender/editors/include/ED_screen_types.h
branches/asset-browser/source/blender/editors/mesh/bmesh_tools.c
branches/asset-browser/source/blender/editors/mesh/mesh_intern.h
branches/asset-browser/source/blender/editors/mesh/mesh_ops.c
branches/asset-browser/source/blender/editors/object/object_modifier.c
branches/asset-browser/source/blender/editors/physics/particle_edit.c
branches/asset-browser/source/blender/editors/screen/screen_ops.c
branches/asset-browser/source/blender/makesdna/DNA_particle_types.h
branches/asset-browser/source/blender/makesrna/intern/rna_particle.c
branches/asset-browser/source/blender/modifiers/intern/MOD_uvproject.c
Added Paths:
-----------
branches/asset-browser/source/blender/bmesh/operators/bmo_inset.c
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/release/datafiles/brushicons/claystrips.png
branches/asset-browser/source/blender/editors/datafiles/claystrips.png.c
branches/asset-browser/source/blender/editors/space_outliner/
Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:43077-44972
+ /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
/trunk/blender:43077-44985
Property changes on: branches/asset-browser/release/datafiles/brushicons/claystrips.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py 2012-03-19 05:55:59 UTC (rev 44986)
@@ -380,6 +380,7 @@
class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel):
bl_label = "Rotation"
+ bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER'}
@classmethod
@@ -394,6 +395,15 @@
else:
return False
+ def draw_header(self, context):
+ psys = context.particle_system
+ if psys:
+ part = psys.settings
+ else:
+ part = context.space_data.pin_id
+
+ self.layout.prop(part, "use_rotations", text="")
+
def draw(self, context):
layout = self.layout
@@ -403,7 +413,7 @@
else:
part = context.space_data.pin_id
- layout.enabled = particle_panel_enabled(context, psys)
+ layout.enabled = particle_panel_enabled(context, psys) and part.use_rotations
layout.prop(part, "use_dynamic_rotation")
Modified: branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py 2012-03-19 05:55:59 UTC (rev 44986)
@@ -985,8 +985,7 @@
layout.separator()
- props = layout.operator("clip.select_all")
- props.action = 'TOGGLE'
+ layout.operator("clip.select_all").action = 'TOGGLE'
layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
layout.menu("CLIP_MT_select_grouped")
Modified: branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/asset-browser/release/scripts/startup/bl_ui/space_image.py 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/release/scripts/startup/bl_ui/space_image.py 2012-03-19 05:55:59 UTC (rev 44986)
@@ -97,7 +97,7 @@
layout.separator()
- layout.operator("uv.select_all")
+ layout.operator("uv.select_all").action = 'TOGGLE'
layout.operator("uv.select_all", text="Inverse").action = 'INVERT'
layout.operator("uv.unlink_selected")
Modified: branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py 2012-03-19 05:55:59 UTC (rev 44986)
@@ -491,7 +491,7 @@
layout.operator("particle.select_all").action = 'TOGGLE'
layout.operator("particle.select_linked")
- layout.operator("particle.select_all").action = 'INVERT'
+ layout.operator("particle.select_all", text="Inverse").action = 'INVERT'
layout.separator()
@@ -621,7 +621,7 @@
layout.separator()
layout.operator("mball.select_all").action = 'TOGGLE'
- layout.operator("mball.select_all").action = 'INVERT'
+ layout.operator("mball.select_all", text="Inverse").action = 'INVERT'
layout.separator()
@@ -638,7 +638,7 @@
layout.separator()
- layout.operator("lattice.select_all")
+ layout.operator("lattice.select_all").action = 'TOGGLE'
layout.operator("lattice.select_all", text="Inverse").action = 'INVERT'
@@ -1757,11 +1757,11 @@
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("mesh.flip_normals")
- # layout.operator("mesh.bevel")
- # layout.operator("mesh.bevel")
layout.operator("mesh.edge_face_add")
layout.operator("mesh.fill")
layout.operator("mesh.beautify_fill")
+ layout.operator("mesh.inset")
+ layout.operator("mesh.bevel")
layout.operator("mesh.solidify")
layout.operator("mesh.sort_faces")
Modified: branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h 2012-03-19 05:55:59 UTC (rev 44986)
@@ -147,6 +147,11 @@
DM_DRAW_ALWAYS_SMOOTH = 2
} DMDrawFlag;
+typedef enum DMDirtyFlag {
+ /* dm has valid tessellated faces, but tessellated CDDATA need to be updated. */
+ DM_DIRTY_TESS_CDLAYERS = 1 << 0,
+} DMDirtyFlag;
+
typedef struct DerivedMesh DerivedMesh;
struct DerivedMesh {
/* Private DerivedMesh data, only for internal DerivedMesh use */
@@ -158,6 +163,7 @@
struct GPUDrawObject *drawObject;
DerivedMeshType type;
float auto_bump_scale;
+ DMDirtyFlag dirty;
/* calculate vert and face normals */
void (*calcNormals)(DerivedMesh *dm);
@@ -540,6 +546,8 @@
void DM_ensure_tessface(DerivedMesh *dm);
+void DM_update_tessface_data(DerivedMesh *dm);
+
/* interpolates vertex data from the vertices indexed by src_indices in the
* source mesh using the given weights and stores the result in the vertex
* indexed by dest_index in the dest mesh
Modified: branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/asset-browser/source/blender/blenkernel/BKE_mesh.h 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/source/blender/blenkernel/BKE_mesh.h 2012-03-19 05:55:59 UTC (rev 44986)
@@ -297,7 +297,7 @@
void BKE_mesh_tessface_ensure(struct Mesh *mesh);
void BKE_mesh_tessface_clear(struct Mesh *mesh);
-/*convert a triangle of loop facedata to mface facedata*/
+/* Convert a triangle or quadrangle of loop/poly data to tessface data */
void mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData *ldata,
struct CustomData *pdata, int lindex[4], int findex,
const int polyindex, const int mf_len,
Modified: branches/asset-browser/source/blender/blenkernel/BKE_multires.h
===================================================================
--- branches/asset-browser/source/blender/blenkernel/BKE_multires.h 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/source/blender/blenkernel/BKE_multires.h 2012-03-19 05:55:59 UTC (rev 44986)
@@ -44,6 +44,9 @@
struct Object;
struct Scene;
+/* Delete mesh mdisps */
+void multires_customdata_delete(struct Mesh *me);
+
void multires_mark_as_modified(struct Object *ob, enum MultiresModifiedFlags flags);
void multires_force_update(struct Object *ob);
Modified: branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-19 05:49:50 UTC (rev 44985)
+++ branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-19 05:55:59 UTC (rev 44986)
@@ -67,6 +67,7 @@
#include "BKE_tessmesh.h"
#include "BKE_bvhutils.h"
#include "BKE_deform.h"
+#include "BKE_global.h" /* For debug flag, DM_update_tessface_data() func. */
#ifdef WITH_GAMEENGINE
#include "BKE_navmesh_conversion.h"
@@ -286,6 +287,7 @@
dm->needsFree = 1;
dm->auto_bump_scale = -1.0f;
+ dm->dirty = 0;
}
void DM_from_template(DerivedMesh *dm, DerivedMesh *source, DerivedMeshType type,
@@ -313,6 +315,7 @@
DM_init_funcs(dm);
dm->needsFree = 1;
+ dm->dirty = 0;
}
int DM_release(DerivedMesh *dm)
@@ -381,6 +384,73 @@
}
}
+/* Update tessface CD data from loop/poly ones. Needed when not retesselating after modstack evaluation. */
+/* NOTE: Assumes dm has valid tesselated data! */
+void DM_update_tessface_data(DerivedMesh *dm)
+{
+ MFace *mf = dm->getTessFaceArray(dm);
+ MPoly *mp = dm->getPolyArray(dm);
+ MLoop *ml = dm->getLoopArray(dm);
+
+ CustomData *fdata = dm->getTessFaceDataLayout(dm);
+ CustomData *pdata = dm->getPolyDataLayout(dm);
+ CustomData *ldata = dm->getLoopDataLayout(dm);
+
+ const int numTex = CustomData_number_of_layers(pdata, CD_MTEXPOLY);
+ const int numCol = CustomData_number_of_layers(ldata, CD_MLOOPCOL);
+ const int hasWCol = CustomData_has_layer(ldata, CD_WEIGHT_MLOOPCOL);
+ const int hasOrigSpace = CustomData_has_layer(ldata, CD_ORIGSPACE_MLOOP);
+
+ int *polyindex = CustomData_get_layer(fdata, CD_POLYINDEX);
+
+ int mf_idx,
+ totface = dm->getNumTessFaces(dm),
+ ml_idx[4];
+
+ /* Should never occure, but better abort than segfault! */
+ if (!polyindex)
+ return;
+
+ CustomData_from_bmeshpoly(fdata, pdata, ldata, totface);
+
+ for (mf_idx = 0; mf_idx < totface; mf_idx++, mf++) {
+ const int mf_len = mf->v4 ? 4 : 3;
+ int i, not_done;
+
+ /* Find out loop indices. */
+ /* XXX Is there a better way to do this? */
+ /* NOTE: This assumes tessface are valid and in sync with loop/poly… Else, most likely, segfault! */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list