[Bf-blender-cvs] [028df92b646] temp-fracture-modifier-2.8: removed accidental code merge failures
Martin Felke
noreply at git.blender.org
Sun Nov 25 13:59:54 CET 2018
Commit: 028df92b64656cf2b0fd45e78cedbf8f4d295e8b
Author: Martin Felke
Date: Sun Nov 25 13:59:28 2018 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB028df92b64656cf2b0fd45e78cedbf8f4d295e8b
removed accidental code merge failures
===================================================================
D README.md
M extern/CMakeLists.txt
M extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
M extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
M extern/voro++/CMakeLists.txt
M intern/cycles/render/image.cpp
M release/scripts/modules/bpy/path.py
M release/scripts/startup/bl_ui/properties_physics_softbody.py
M source/blender/alembic/intern/abc_customdata.cc
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/BKE_deform.h
M source/blender/blenkernel/BKE_mball_tessellate.h
M source/blender/blenkernel/BKE_object_deform.h
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/mask_evaluate.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenlib/BLI_edgehash.h
M source/blender/blenlib/BLI_heap.h
M source/blender/blenlib/BLI_math_geom.h
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_edgeloop.c
M source/blender/depsgraph/DEG_depsgraph.h
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_inset.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_input.c
M source/blender/makesrna/intern/rna_meta.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/render/intern/source/bake_api.c
M source/blender/windowmanager/intern/wm_jobs.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/README.md b/README.md
deleted file mode 100644
index 3974b79bb29..00000000000
--- a/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Blender Fracture Modifier
-
-The Fracture Modifier is a system to interactively destroy and physically simulate the shards of objects in an easy, performant and
-non-destructive way. This allows you to shatter and simulate the objects as you like while the original geometry of the object remains
-untouched and intact.
-
-## Support and builds
-[BlenderArtists.org support forum thread](http://blenderartists.org/forum/showthread.php?343637)<br>
-[DF-VFX Hosted Fracture Modifier Builds](http://df-vfx.de/fracturemodifier/)
-
-## Main Documentation
-[BlenderWiki page about Fracture Modifier](https://wiki.blender.org/index.php/User:Scorpion81/Fracture_Documentation)
-
-## Useful Videos
-[Development and experimental videos from the fracture modifier build & helpers addon by Dennis Fassbaender](https://www.youtube.com/playlist?list=PLyWdRVpqt5ZdQ6SdPuLQ76nShiuwXu_uC)<br>
-[Simulation Videos made by Kai Kostack](https://www.youtube.com/playlist?list=PLGYnM-Mk7-OeqpCBmw6ZjFyiopkvkE6_S)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index dcc2965d420..5221b0695a0 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -95,7 +95,6 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
add_subdirectory(gflags)
endif()
add_subdirectory(glog)
-
endif()
if(WITH_GTESTS)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
index beb6eb3964c..ef2a29202f7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
@@ -80,11 +80,6 @@ class btUnionFind
void unite(int p, int q)
{
- if (p == -1 && q == -1) {
- //error case... should not happen but happens ?
- return;
- }
-
int i = find(p), j = find(q);
if (i == j)
return;
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
index 6ca336b7766..c2f8c5d64ae 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -183,7 +183,7 @@ public:
{
//No constraints should point to this rigidbody
//Remove constraints from the dynamics world before you delete the related rigidbodies.
- // btAssert(m_constraintRefs.size()==0);
+ btAssert(m_constraintRefs.size()==0);
}
protected:
diff --git a/extern/voro++/CMakeLists.txt b/extern/voro++/CMakeLists.txt
index 938f3fc0113..e39f24ba1b1 100644
--- a/extern/voro++/CMakeLists.txt
+++ b/extern/voro++/CMakeLists.txt
@@ -16,7 +16,6 @@ set (SRC
src/unitcell.cc
src/v_base.cc
src/v_compute.cc
-# src/voro++.cc
src/wall.cc
src/c_interface.cc
@@ -31,7 +30,6 @@ set (SRC
src/unitcell.hh
src/v_base.hh
src/v_compute.hh
-# src/voro++.hh
src/wall.hh
src/worklist.hh
src/c_interface.hh
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 932c8fb2912..2865b0e5e97 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -543,10 +543,6 @@ bool ImageManager::file_load_image(Image *img,
/* Could be that we've run out of memory. */
return false;
}
- if(pixels == NULL) {
- /* Could be that we've run out of memory. */
- return false;
- }
bool cmyk = false;
const size_t num_pixels = ((size_t)width) * height * depth;
if(in) {
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index 6b713ad7eb7..d236af87052 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -225,15 +225,6 @@ def display_name(name):
name = _clean_utf8(name)
return name
-def display_name_to_filepath(name):
- """
- Performs the reverse of display_name using literal versions of characters
- which aren't supported in a filepath.
- """
- for disp_value, file_value in _display_name_literals.items():
- name = name.replace(disp_value, file_value)
- return name
-
def display_name_to_filepath(name):
"""
diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py
index c962befc457..7f1da6a4acb 100644
--- a/release/scripts/startup/bl_ui/properties_physics_softbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py
@@ -30,9 +30,6 @@ from .properties_physics_common import (
COMPAT_OB_TYPES = {'MESH', 'LATTICE', 'CURVE', 'SURFACE', 'FONT'}
-COMPAT_OB_TYPES = {'MESH', 'LATTICE', 'CURVE', 'SURFACE', 'FONT'}
-
-
def softbody_panel_enabled(md):
return (md.point_cache.is_baked is False)
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc
index f62e0ec214e..424475dc61b 100644
--- a/source/blender/alembic/intern/abc_customdata.cc
+++ b/source/blender/alembic/intern/abc_customdata.cc
@@ -276,7 +276,6 @@ static void read_uvs(const CDStreamConfig &config, void *data,
unsigned int rev_loop_offset = poly.loopstart + poly.totloop - 1;
for (int f = 0; f < poly.totloop; ++f) {
- rev_loop_index = poly.loopstart + poly.totloop - f - 1;
loop_index = poly.loopstart + f;
rev_loop_index = rev_loop_offset - f;
uv_index = (*indices)[loop_index];
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 6f1819ff81d..32b9508a679 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,7 +35,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR b
+#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index b6333308f60..91743bfa567 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -113,8 +113,6 @@ bool BKE_brush_use_size_pressure(const struct Scene *scene, const struct Brush *
bool BKE_brush_sculpt_has_secondary_color(const struct Brush *brush);
-bool BKE_brush_sculpt_has_secondary_color(const struct Brush *brush);
-
/* scale unprojected radius to reflect a change in the brush's 2D size */
void BKE_brush_scale_unprojected_radius(
float *unprojected_radius,
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index f24108deb7d..a29f4197299 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -28,8 +28,6 @@
#ifndef __BKE_DEFORM_H__
#define __BKE_DEFORM_H__
-#include "DNA_object_types.h"
-
/** \file BKE_deform.h
* \ingroup bke
* \since June 2001
diff --git a/source/blender/blenkernel/BKE_mball_tessellate.h b/source/blender/blenkernel/BKE_mball_tessellate.h
index 1c3f5b3563e..363bfe09c75 100644
--- a/source/blender/blenkernel/BKE_mball_tessellate.h
+++ b/source/blender/blenkernel/BKE_mball_tessellate.h
@@ -27,8 +27,6 @@ struct Depsgraph;
struct Main;
struct Object;
struct Scene;
-struct DerivedMesh;
-struct DispList;
void BKE_mball_polygonize(
struct Depsgraph *depsgraph, struct Scene *scene,
@@ -36,9 +34,4 @@ void BKE_mball_polygonize(
void BKE_mball_cubeTable_free(void);
-struct DerivedMesh* BKE_repolygonize_dm(struct DerivedMesh *dm, float thresh, float basesize[3], float wiresize,
- float rendersize, bool render, bool override_size, int defgrp_size);
-
-void BKE_dm_from_metaball(struct DispList *dl, struct DerivedMesh *dm, struct DerivedMesh *odm, int *orig_index);
-
#endif /* __BKE_MBALL_TESSELLATE_H__ */
diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h
index c94b142af9f..ab54330cf53 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -79,4 +79,11 @@ void BKE_object_defgroup_mirror_selection(
}
#endif
+/* Select helpers */
+bool *BKE_objdef_vgroup_subset_from_select_type(
+ struct Object *ob, enum eVGroupSelect subset_type, int *r_vgroup_tot, int *r_subset_count);
+void BKE_objdef_vgroup_subset_to_index_array(
+ const bool *vgroup_validmap, const int vgroup_tot, int *r_vgroup_subset_map);
+
+
#endif /* __BKE_OBJECT_DEFORM_H__ */
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 3da7d75d01d..cc42fe71579 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -243,6 +243,7 @@ static void setup_app_data(
CTX_data_main_set(C, bmain);
if (bfd->user) {
+
/* only here free userdef themes... */
BKE_blender_userdef_data_set_and_free(bfd->user);
bfd->user = NULL;
diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c
index 9427d668a93..55939f8eadf 100644
--- a/source/blender/blenkernel/intern/mask_evaluate.c
+++ b/source/blender/blenkernel/intern/mask_evaluate.c
@@ -43,7 +43,6 @@
#include "DNA_object_types.h"
#include "BKE_curve.h"
-#include "BKE_global.h"
#include "BKE_mask.h"
#include "DEG_depsgraph.h"
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index bf29fbc8d2c..6741ebf39d2 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -46,7 +46,6 @@
#include "DNA_gpencil_types.h"
#include "DNA_ID.h"
#include "DNA_meta_types.h"
-#include "DNA_modifier_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
@@ -60,7 +59,6 @@
#include "BKE_animsys.h"
#include "BKE_brush.h"
#include "BKE_displist.h"
-#include "BKE_DerivedMesh.h"
#include "BKE_global.h"
#include "BKE_gpen
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list