[Bf-blender-cvs] [0aa824cad2b] greasepencil-object: GPencil: Revert wrong merge of LANPR branch
Antonioya
noreply at git.blender.org
Tue Aug 6 22:07:08 CEST 2019
Commit: 0aa824cad2bf1b0715551425076bbc2156153190
Author: Antonioya
Date: Tue Aug 6 19:43:09 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0aa824cad2bf1b0715551425076bbc2156153190
GPencil: Revert wrong merge of LANPR branch
Due to an error, the code of LANPR branch was merged accidentally to the Grease Pencil branch.
This commit reverts all work to the last correct commit.
The command executed was: `git diff ff7482286319e7b462b98dc26909b47d9d661ec6 | patch -p1 -R`
Thanks to @dfelinto for fixing the error.
===================================================================
D bvhtree
M intern/opensubdiv/internal/opensubdiv_evaluator.cc
M intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
M intern/opensubdiv/internal/opensubdiv_evaluator_internal.h
M intern/opensubdiv/opensubdiv_evaluator_capi.h
D mesh
M release/scripts/startup/bl_operators/__init__.py
D release/scripts/startup/bl_operators/lanpr.py
M release/scripts/startup/bl_ui/__init__.py
D release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_data_armature.py
M release/scripts/startup/bl_ui/properties_data_bone.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_data_curve.py
M release/scripts/startup/bl_ui/properties_data_lattice.py
M release/scripts/startup/bl_ui/properties_data_light.py
M release/scripts/startup/bl_ui/properties_data_mesh.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/properties_data_speaker.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
D release/scripts/startup/bl_ui/properties_lanpr.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/properties_output.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_cloth.py
M release/scripts/startup/bl_ui/properties_physics_common.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_physics_field.py
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M release/scripts/startup/bl_ui/properties_physics_rigidbody.py
M release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
M release/scripts/startup/bl_ui/properties_physics_softbody.py
M release/scripts/startup/bl_ui/properties_render.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/properties_view_layer.py
M release/scripts/startup/bl_ui/properties_world.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf_thumbs.c
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/subdiv_mesh.c
M source/blender/blenkernel/intern/tracking_stabilize.c
M source/blender/blenlib/BLI_math_base.h
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/blentranslation/CMakeLists.txt
M source/blender/blentranslation/intern/blt_lang.c
M source/blender/bmesh/operators/bmo_primitive.c
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/engines/gpencil/gpencil_shader_fx.c
M source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl
D source/blender/draw/engines/lanpr/lanpr_access.h
D source/blender/draw/engines/lanpr/lanpr_all.h
D source/blender/draw/engines/lanpr/lanpr_chain_draw.c
D source/blender/draw/engines/lanpr/lanpr_cpu.c
D source/blender/draw/engines/lanpr/lanpr_dpix.c
D source/blender/draw/engines/lanpr/lanpr_engine.c
D source/blender/draw/engines/lanpr/lanpr_snake.c
D source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_edge_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
D source/blender/draw/engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_texture.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/CMakeLists.txt
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_merge.c
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/gpencil/gpencil_paint.c
D source/blender/editors/include/ED_lanpr.h
M source/blender/editors/include/ED_svg.h
M source/blender/editors/io/CMakeLists.txt
M source/blender/editors/io/io_svg.c
M source/blender/editors/io/io_svg.h
D source/blender/editors/lanpr/CMakeLists.txt
D source/blender/editors/lanpr/lanpr_chain.c
D source/blender/editors/lanpr/lanpr_ops.c
D source/blender/editors/lanpr/lanpr_util.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_select_similar.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/mesh_intern.h
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/render/render_intern.h
M source/blender/editors/render/render_ops.c
M source/blender/editors/render/render_update.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_clip/clip_graph_draw.c
M source/blender/editors/space_clip/clip_graph_ops.c
M source/blender/editors/space_clip/clip_intern.h
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_clip/tracking_ops_solve.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/imbuf/IMB_thumbs.h
M source/blender/imbuf/intern/thumbs_font.c
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_customdata_types.h
D source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_internal.h
D source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_meta.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
M source/blender/modifiers/intern/MOD_edgesplit.c
D source/blender/modifiers/intern/MOD_featureline.c
D source/blender/modifiers/intern/MOD_mybmesh.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/python/bmesh/bmesh_py_types_customdata.c
M source/blender/windowmanager/intern/wm_init_exit.c
D v
D x
===================================================================
diff --git a/bvhtree b/bvhtree
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator.cc b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
index c91408e8fd3..2500691885c 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
@@ -102,21 +102,6 @@ void evaluateLimit(OpenSubdiv_Evaluator *evaluator,
evaluator->internal->eval_output->evaluateLimit(ptex_face_index, face_u, face_v, P, dPdu, dPdv);
}
-void evaluateLimit2(OpenSubdiv_Evaluator *evaluator,
- const int ptex_face_index,
- const float face_u,
- const float face_v,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3])
-{
- evaluator->internal->eval_output->evaluateLimit2(
- ptex_face_index, face_u, face_v, P, dPdu, dPdv, dPduu, dPduv, dPdvv);
-}
-
void evaluateVarying(OpenSubdiv_Evaluator *evaluator,
const int ptex_face_index,
float face_u,
@@ -150,7 +135,6 @@ void assignFunctionPointers(OpenSubdiv_Evaluator *evaluator)
evaluator->refine = refine;
evaluator->evaluateLimit = evaluateLimit;
- evaluator->evaluateLimit2 = evaluateLimit2;
evaluator->evaluateVarying = evaluateVarying;
evaluator->evaluateFaceVarying = evaluateFaceVarying;
}
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
index 8104d6a29c5..fa45c0119ec 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
@@ -461,73 +461,6 @@ class VolatileEvalOutput {
}
}
- void evalPatchesWithDerivatives2(const PatchCoord &patch_coord,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3])
- {
- StackAllocatedBuffer<6, 1> vertex_data;
- StackAllocatedBuffer<6, 1> derivatives;
- StackAllocatedBuffer<6, 1> derivatives1;
- StackAllocatedBuffer<6, 1> derivatives2;
- BufferDescriptor vertex_desc(0, 3, 6), du_desc(0, 3, 6), dv_desc(3, 3, 6), duu_desc(0, 3, 6),
- duv_desc(3, 3, 6), dvv_desc(0, 3, 6);
- SinglePatchCoordBuffer patch_coord_buffer(patch_coord);
- const EVALUATOR *eval_instance = OpenSubdiv::Osd::GetEvaluator<EVALUATOR>(evaluator_cache_,
- src_desc_,
- vertex_desc,
- du_desc,
- dv_desc,
- duu_desc,
- duv_desc,
- dvv_desc,
- device_context_);
- EVALUATOR::EvalPatches(src_data_,
- src_desc_,
- &vertex_data,
- vertex_desc,
- &derivatives,
- du_desc,
- &derivatives,
- dv_desc,
- &derivatives1,
- duu_desc,
- &derivatives1,
- duv_desc,
- &derivatives2,
- dvv_desc,
- patch_coord_buffer.GetNumVertices(),
- &patch_coord_buffer,
- patch_table_,
- eval_instance,
- device_context_);
- float *refined_verts = vertex_data.BindCpuBuffer();
- memcpy(P, refined_verts, sizeof(float) * 3);
- if (dPdu != NULL || dPdv != NULL || dPduu != NULL || dPduv != NULL || dPdvv != NULL) {
- float *refined_drivatives = derivatives.BindCpuBuffer();
- float *refined_drivatives1 = derivatives1.BindCpuBuffer();
- float *refined_drivatives2 = derivatives2.BindCpuBuffer();
- if (dPdu) {
- memcpy(dPdu, refined_drivatives, sizeof(float) * 3);
- }
- if (dPdv) {
- memcpy(dPdv, refined_drivatives + 3, sizeof(float) * 3);
- }
- if (dPduu) {
- memcpy(dPduu, refined_drivatives1, sizeof(float) * 3);
- }
- if (dPduv) {
- memcpy(dPduv, refined_drivatives1 + 3, sizeof(float) * 3);
- }
- if (dPdvv) {
- memcpy(dPdvv, refined_drivatives2, sizeof(float) * 3);
- }
- }
- }
-
void evalPatchVarying(const PatchCoord &patch_coord, float varying[3])
{
StackAllocatedBuffer<6, 1> varying_data;
@@ -727,30 +660,6 @@ void CpuEvalOutputAPI::evaluateLimit(const int ptex_face_index,
}
}
-void CpuEvalOutputAPI::evaluateLimit2(const int ptex_face_index,
- float face_u,
- float face_v,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3])
-{
- assert(face_u >= 0.0f);
- assert(face_u <= 1.0f);
- assert(face_v >= 0.0f);
- assert(face_v <= 1.0f);
- const PatchTable::PatchHandle *handle = patch_map_->FindPatch(ptex_face_index, face_u, face_v);
- PatchCoord patch_coord(*handle, face_u, face_v);
- if (dPdu != NULL || dPdv != NULL || dPduu != NULL || dPduv != NULL || dPdvv != NULL) {
- implementation_->evalPatchesWithDerivatives2(patch_coord, P, dPdu, dPdv, dPduu, dPduv, dPdvv);
- }
- else {
- implementation_->evalPatchCoord(patch_coord, P);
- }
-}
-
void CpuEvalOutputAPI::evaluateVarying(const int ptex_face_index,
float face_u,
float face_v,
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h
index a74be08a177..7c963227d17 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h
@@ -103,16 +103,6 @@ class CpuEvalOutputAPI {
float dPdu[3],
float dPdv[3]);
- void evaluateLimit2(const int ptex_face_index,
- float face_u,
- float face_v,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3]);
-
// Evaluate varying data at a given bilinear coordinate of given ptex face.
void evaluateVarying(const int ptes_face_index, float face_u, float face_v, float varying[3]);
diff --git a/intern/opensubdiv/opensubdiv_evaluator_capi.h b/intern/opensubdiv/opensubdiv_evaluator_capi.h
index ce38f0f5398..ceb0c58feba 100644
--- a/intern/opensubdiv/opensubdiv_evaluator_capi.h
+++ b/intern/opensubdiv/opensubdiv_evaluator_capi.h
@@ -92,17 +92,6 @@ typedef struct OpenSubdiv_Evaluator {
float dPdu[3],
float dPdv[3]);
- void (*evaluateLimit2)(struct OpenSubdiv_Evaluator *evaluator,
- const int ptex_face_index,
- float face_u,
- float face_v,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3]);
-
// Evaluate varying data at a given bilinear coordinate of given ptex face.
void (*evaluateVarying)(struct OpenSubdiv_Evaluator *evaluator,
const int ptex_face_index,
diff --git a/mesh b/mesh
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py
index 3cdded79fd2..bb92e070d00 100644
--- a/release/scripts/startup/bl_operators/__init__.py
+++ b/release/scripts/startup/bl_operators/__init__.py
@@ -32,7 +32,6 @@ _modules = [
"constraint",
"file",
"image",
- "lanpr",
"mask",
"mesh",
"node",
diff --git a/release/scripts/startup/bl_operators/lanpr.py b/release/scripts/startup/bl_operators/lanpr.py
deleted file mode 100644
index c296ffb1347..00000000000
--- a/release/scripts/startup/bl_operators/lanpr.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import bpy
-import string
-
-class LANPR_reset_object_transfromations(bpy.types.Operator):
- """Reset T
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list